Redo Merge branch 'hotfix/5.21' Standardized file headers

Try to do it right this time...

# Conflicts:
#	adodb-memcache.lib.inc.php

Fixes #751

189 files changed, 3814 insertions, 2324 deletions

diff --git a/adodb-active-record.inc.php b/adodb-active-record.inc.php
index 68021ce4..3c418bf8 100644
--- a/adodb-active-record.inc.php
+++ b/adodb-active-record.inc.php
@@ -1,23 +1,23 @@
 <?php
-/*
-
-@version   v5.21.1-dev  Unreleased
-@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
-@copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
-  Latest version is available at https://adodb.org/
-
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence.
-
-  Active Record implementation. Superset of Zend Framework's.
-
-  Version 0.92
-
-  See http://www-128.ibm.com/developerworks/java/library/j-cb03076/?ca=dgr-lnxw01ActiveRecord
-  	for info on Ruby on Rails Active Record implementation
-*/
-
+/**
+ * Active Record implementation. Superset of Zend Framework's.
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 
 global $_ADODB_ACTIVE_DBS;
 global $ADODB_ACTIVE_CACHESECS; // set to true to enable caching of metadata such as field info
diff --git a/adodb-active-recordx.inc.php b/adodb-active-recordx.inc.php
index fc6631ef..5de5b130 100644
--- a/adodb-active-recordx.inc.php
+++ b/adodb-active-recordx.inc.php
@@ -1,27 +1,27 @@
 <?php
-/*
+/**
+ * Active Record implementation. Superset of Zend Framework's.
+ *
+ * This is "Active Record eXtended" to support JOIN, WORK and LAZY mode
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 
-@version   v5.21.1-dev  Unreleased
-@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
-@copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
-  Latest version is available at https://adodb.org/
-
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence.
-
-  Active Record implementation. Superset of Zend Framework's.
-
-  This is "Active Record eXtended" to support JOIN, WORK and LAZY mode by Chris Ravenscroft  chris#voilaweb.com
-
-  Version 0.9
-
-  See http://www-128.ibm.com/developerworks/java/library/j-cb03076/?ca=dgr-lnxw01ActiveRecord
-  	for info on Ruby on Rails Active Record implementation
-*/
-
-
-	// CFR: Active Records Definitions
+// CFR: Active Records Definitions
 define('ADODB_JOIN_AR', 0x01);
 define('ADODB_WORK_AR', 0x02);
 define('ADODB_LAZY_AR', 0x03);
diff --git a/adodb-csvlib.inc.php b/adodb-csvlib.inc.php
index a903ea2f..6977c3dc 100644
--- a/adodb-csvlib.inc.php
+++ b/adodb-csvlib.inc.php
@@ -1,4 +1,26 @@
 <?php
+/**
+ * Library for CSV serialization.
+ *
+ * This is used by the csv/proxy driver and is the CacheExecute()
+ * serialization format.
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 
 // security - hide paths
 if (!defined('ADODB_DIR')) die();
@@ -6,22 +28,6 @@ if (!defined('ADODB_DIR')) die();
 global $ADODB_INCLUDED_CSV;
 $ADODB_INCLUDED_CSV = 1;
 
-/*
-
-  @version   v5.21.1-dev  Unreleased
-  @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
-  @copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence. See License.txt.
-  Set tabs to 4 for best viewing.
-
-  Latest version is available at https://adodb.org/
-
-  Library for CSV serialization. This is used by the csv/proxy driver and is the
-  CacheExecute() serialization format.
-*/
-
 	/**
  	 * convert a recordset into special format
 	 *
diff --git a/adodb-datadict.inc.php b/adodb-datadict.inc.php
index 35191fa6..bfacb5ff 100644
--- a/adodb-datadict.inc.php
+++ b/adodb-datadict.inc.php
@@ -1,27 +1,30 @@
 <?php
-
 /**
-  @version   v5.21.1-dev  Unreleased
-  @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
-  @copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence.
-
-  Set tabs to 4 for best viewing.
-
- 	DOCUMENTATION:
-
-		See adodb/tests/test-datadict.php for docs and examples.
-*/
-
-/*
-	Test script for parser
-*/
+ * ADOdb Data Dictionary base class.
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 
 // security - hide paths
 if (!defined('ADODB_DIR')) die();
 
+/**
+ * Test script for parser
+ */
 function lens_ParseTest()
 {
 $str = "`zcol ACOL` NUMBER(32,2) DEFAULT 'The \"cow\" (and Jim''s dog) jumps over the moon' PRIMARY, INTI INT AUTO DEFAULT 0, zcol2\"afs ds";
diff --git a/adodb-error.inc.php b/adodb-error.inc.php
index 9751484f..517cf9b0 100644
--- a/adodb-error.inc.php
+++ b/adodb-error.inc.php
@@ -1,19 +1,27 @@
 <?php
 /**
- * @version   v5.21.1-dev  Unreleased
- * @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
- * @copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
- * Released under both BSD license and Lesser GPL library license.
- * Whenever there is any discrepancy between the two licenses,
- * the BSD license will take precedence.
+ * Error handling code and constants.
  *
- * Set tabs to 4 for best viewing.
+ * Adapted from the PEAR DB error handling code.
+ * Portions (c)1997-2002 The PHP Group
  *
- * The following code is adapted from the PEAR DB error handling code.
- * Portions (c)1997-2002 The PHP Group.
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
  */
 
-
 if (!defined("DB_ERROR")) define("DB_ERROR",-1);
 
 if (!defined("DB_ERROR_SYNTAX")) {
diff --git a/adodb-errorhandler.inc.php b/adodb-errorhandler.inc.php
index e68dfbae..0cd3f218 100644
--- a/adodb-errorhandler.inc.php
+++ b/adodb-errorhandler.inc.php
@@ -1,18 +1,23 @@
 <?php
 /**
- * @version   v5.21.1-dev  Unreleased
- * @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
- * @copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
- * Released under both BSD license and Lesser GPL library license.
- * Whenever there is any discrepancy between the two licenses,
- * the BSD license will take precedence.
+ * ADOdb Default Error Handler.
  *
- * Set tabs to 4 for best viewing.
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
  *
- * Latest version is available at https://adodb.org/
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
  *
-*/
-
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 
 // added Claudio Bustos  clbustos#entelchile.net
 if (!defined('ADODB_ERROR_HANDLER_TYPE')) define('ADODB_ERROR_HANDLER_TYPE',E_USER_ERROR);
diff --git a/adodb-errorpear.inc.php b/adodb-errorpear.inc.php
index 5ef4a3db..2bb15947 100644
--- a/adodb-errorpear.inc.php
+++ b/adodb-errorpear.inc.php
@@ -1,17 +1,24 @@
 <?php
 /**
- * @version   v5.21.1-dev  Unreleased
- * @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
- * @copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
- * Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence.
+ * Error Handler with PEAR support.
  *
- * Set tabs to 4 for best viewing.
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
  *
- * Latest version is available at https://adodb.org/
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
  *
-*/
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
+
 include_once('PEAR.php');
 
 if (!defined('ADODB_ERROR_HANDLER')) define('ADODB_ERROR_HANDLER','ADODB_Error_PEAR');
diff --git a/adodb-exceptions.inc.php b/adodb-exceptions.inc.php
index 30c0690b..9f1176f0 100644
--- a/adodb-exceptions.inc.php
+++ b/adodb-exceptions.inc.php
@@ -1,21 +1,24 @@
 <?php
-
 /**
- * @version   v5.21.1-dev  Unreleased
- * @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
- * @copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
- * Released under both BSD license and Lesser GPL library license.
- * Whenever there is any discrepancy between the two licenses,
- * the BSD license will take precedence.
+ * Error handling using Exceptions.
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
  *
- * Set tabs to 4 for best viewing.
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
  *
- * Latest version is available at https://adodb.org/
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
  *
- * Exception-handling code using PHP5 exceptions (try-catch-throw).
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
  */
 
-
 if (!defined('ADODB_ERROR_HANDLER_TYPE')) define('ADODB_ERROR_HANDLER_TYPE',E_USER_ERROR);
 define('ADODB_ERROR_HANDLER','adodb_throw');
 
diff --git a/adodb-iterator.inc.php b/adodb-iterator.inc.php
deleted file mode 100644
index ac44fbfb..00000000
--- a/adodb-iterator.inc.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-/*
-  @version   v5.21.1-dev  Unreleased
-  @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
-  @copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence.
-
-  Set tabs to 4.
-
-  Declares the ADODB Base Class for PHP5 "ADODB_BASE_RS", and supports iteration with
-  the ADODB_Iterator class.
-
-  		$rs = $db->Execute("select * from adoxyz");
-		foreach($rs as $k => $v) {
-			echo $k; print_r($v); echo "<br>";
-		}
-
-
-	Iterator code based on http://cvs.php.net/cvs.php/php-src/ext/spl/examples/cachingiterator.inc?login=2
-
-
-	Moved to adodb.inc.php to improve performance.
- */
diff --git a/adodb-lib.inc.php b/adodb-lib.inc.php
index 35e9eca5..c1d935ab 100644
--- a/adodb-lib.inc.php
+++ b/adodb-lib.inc.php
@@ -1,22 +1,32 @@
 <?php
+/**
+ * Helper functions.
+ *
+ * Less commonly used functions are placed here to reduce size of adodb.inc.php.
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
+
 // security - hide paths
 if (!defined('ADODB_DIR')) die();
 
 global $ADODB_INCLUDED_LIB;
 $ADODB_INCLUDED_LIB = 1;
 
-/*
-  @version   v5.21.1-dev  Unreleased
-  @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
-  @copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence. See License.txt.
-  Set tabs to 4 for best viewing.
-
-  Less commonly used functions are placed here to reduce size of adodb.inc.php.
-*/
-
 function adodb_strip_order_by($sql)
 {
 	$rez = preg_match_all('/(\sORDER\s+BY\s(?:[^)](?!LIMIT))*)/is', $sql, $arr);
diff --git a/adodb-loadbalancer.inc.php b/adodb-loadbalancer.inc.php
index 0d0ecac3..2e4f3928 100644
--- a/adodb-loadbalancer.inc.php
+++ b/adodb-loadbalancer.inc.php
@@ -8,20 +8,20 @@
  * including dealing with connection failures and retrying queries on a different
  * connection instead.
  *
- * Released under both BSD license and Lesser GPL library license.
- * Whenever there is any discrepancy between the two licenses,
- * the BSD license will take precedence. See LICENSE.md.
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
  *
- * Latest version is available at https://adodb.org/
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
  *
- * @package   ADOdb
- * @version   v5.21.1-dev  Unreleased
- * @author    Mike Benoit
- * @copyright (c) 2016 Mike Benoit and the ADOdb community
- * @license   BSD-3-Clause
- * @license   GNU Lesser General Public License (LGPL) v2.1 or later
- * @link      https://adodb.org/
- * @since     v5.21.0
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2016 Mike Benoit and the ADOdb community
  */
 
 /**
diff --git a/adodb-memcache.lib.inc.php b/adodb-memcache.lib.inc.php
index 8b9486b0..16a0ba57 100644
--- a/adodb-memcache.lib.inc.php
+++ b/adodb-memcache.lib.inc.php
@@ -1,4 +1,23 @@
 <?php
+/**
+ * Memory caching.
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 
 // security - hide paths
 if (!defined('ADODB_DIR')) die();
@@ -9,22 +28,6 @@ $ADODB_INCLUDED_MEMCACHE = 1;
 global $ADODB_INCLUDED_CSV;
 if (empty($ADODB_INCLUDED_CSV)) 
 	include_once(ADODB_DIR.'/adodb-csvlib.inc.php');
-/*
-
-  @version   v5.21.1-dev  Unreleased
-  @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
-  @copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence. See License.txt.
-  Set tabs to 4 for best viewing.
-
-  Latest version is available at https://adodb.org/
-
-
-
-  Class instance is stored in $ADODB_CACHE
-*/
 
 class ADODB_Cache_MemCache 
 {
diff --git a/adodb-pager.inc.php b/adodb-pager.inc.php
index 9fa2a513..cfe981d3 100644
--- a/adodb-pager.inc.php
+++ b/adodb-pager.inc.php
@@ -1,28 +1,24 @@
 <?php
+/**
+ * Recordset pagination with First/Prev/Next/Last links
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 
-/*
-	@version   v5.21.1-dev  Unreleased
-	@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
-	@copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
-	  Released under both BSD license and Lesser GPL library license.
-	  Whenever there is any discrepancy between the two licenses,
-	  the BSD license will take precedence.
-	  Set tabs to 4 for best viewing.
-
-  	This class provides recordset pagination with
-	First/Prev/Next/Last links.
-
-	Feel free to modify this class for your own use as
-	it is very basic. To learn how to use it, see the
-	example in adodb/tests/testpaging.php.
-
-	"Pablo Costa" <pablo@cbsp.com.br> implemented Render_PageLinks().
-
-	Please note, this class is entirely unsupported,
-	and no free support requests except for bug reports
-	will be entertained by the author.
-
-*/
 class ADODB_Pager {
 	var $id; 	// unique id for pager (defaults to 'adodb')
 	var $db; 	// ADODB connection object
diff --git a/adodb-pear.inc.php b/adodb-pear.inc.php
index 3c726665..c48ef132 100644
--- a/adodb-pear.inc.php
+++ b/adodb-pear.inc.php
@@ -1,18 +1,25 @@
 <?php
 /**
- * @version   v5.21.1-dev  Unreleased
- * @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
- * @copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
- * Released under both BSD license and Lesser GPL library license.
- * Whenever there is any discrepancy between the two licenses,
- * the BSD license will take precedence.
+ * PEAR DB Emulation Layer for ADOdb.
  *
- * Set tabs to 4 for best viewing.
+ * The following code is modelled on PEAR DB code by Stig Bakken <ssb@fast.no>
+ * and Tomas V.V.Cox <cox@idecnet.com>. Portions (c)1997-2002 The PHP Group.
  *
- * PEAR DB Emulation Layer for ADODB.
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
  *
- * The following code is modelled on PEAR DB code by Stig Bakken <ssb@fast.no>								   |
- * and Tomas V.V.Cox <cox@idecnet.com>.	Portions (c)1997-2002 The PHP Group.
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
  */
 
  /*
diff --git a/adodb-perf.inc.php b/adodb-perf.inc.php
index a171a625..d9d8a993 100644
--- a/adodb-perf.inc.php
+++ b/adodb-perf.inc.php
@@ -1,22 +1,23 @@
 <?php
-/*
-@version   v5.21.1-dev  Unreleased
-@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
-@copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence. See License.txt.
-  Set tabs to 4 for best viewing.
-
-  Latest version is available at https://adodb.org/
-
-  Library for basic performance monitoring and tuning.
-
-  My apologies if you see code mixed with presentation. The presentation suits
-  my needs. If you want to separate code from presentation, be my guest. Patches
-  are welcome.
-
-*/
+/**
+ * performance monitoring and tuning.
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 
 if (!defined('ADODB_DIR')) include_once(dirname(__FILE__).'/adodb.inc.php');
 include_once(ADODB_DIR.'/tohtml.inc.php');
diff --git a/adodb-php4.inc.php b/adodb-php4.inc.php
deleted file mode 100644
index 16decdac..00000000
--- a/adodb-php4.inc.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-/*
-  @version   v5.21.1-dev  Unreleased
-  @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
-  @copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence.
-
-  Set tabs to 4.
-*/
-
-
-class ADODB_BASE_RS {
-}
diff --git a/adodb-time.inc.php b/adodb-time.inc.php
index 072e5e49..cfbdc6a5 100644
--- a/adodb-time.inc.php
+++ b/adodb-time.inc.php
@@ -1,72 +1,67 @@
 <?php
-/*
-ADOdb Date Library, part of the ADOdb abstraction library
-
-Latest version is available at https://adodb.org/
-
-@version   v5.21.1-dev  Unreleased
-@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
-@copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
-
-PHP native date functions use integer timestamps for computations.
-Because of this, dates are restricted to the years 1901-2038 on Unix
-and 1970-2038 on Windows due to integer overflow for dates beyond
-those years. This library overcomes these limitations by replacing the
-native function's signed integers (normally 32-bits) with PHP floating
-point numbers (normally 64-bits).
-
-Dates from 100 A.D. to 3000 A.D. and later
-have been tested. The minimum is 100 A.D. as <100 will invoke the
-2 => 4 digit year conversion. The maximum is billions of years in the
-future, but this is a theoretical limit as the computation of that year
-would take too long with the current implementation of adodb_mktime().
-
-This library replaces native functions as follows:
-
-<pre>
-	getdate()  with  adodb_getdate()
-	date()     with  adodb_date()
-	gmdate()   with  adodb_gmdate()
-	mktime()   with  adodb_mktime()
-	gmmktime() with  adodb_gmmktime()
-	strftime() with  adodb_strftime()
-	strftime() with  adodb_gmstrftime()
-</pre>
-
-The parameters are identical, except that adodb_date() accepts a subset
-of date()'s field formats. Mktime() will convert from local time to GMT,
-and date() will convert from GMT to local time, but daylight savings is
-not handled currently.
-
-This library is independent of the rest of ADOdb, and can be used
-as standalone code.
-
-PERFORMANCE
-
-For high speed, this library uses the native date functions where
-possible, and only switches to PHP code when the dates fall outside
-the 32-bit signed integer range.
-
-GREGORIAN CORRECTION
-
-Pope Gregory shortened October of A.D. 1582 by ten days. Thursday,
-October 4, 1582 (Julian) was followed immediately by Friday, October 15,
-1582 (Gregorian).
-
-Since 0.06, we handle this correctly, so:
-
-adodb_mktime(0,0,0,10,15,1582) - adodb_mktime(0,0,0,10,4,1582)
-	== 24 * 3600 (1 day)
-
-=============================================================================
-
-COPYRIGHT
-
-(c) 2003-2014 John Lim and released under BSD-style license except for code by
-jackbbs, which includes adodb_mktime, adodb_get_gmt_diff, adodb_is_leap_year
-and originally found at http://www.php.net/manual/en/function.mktime.php
-
+/**
+ * ADOdb Date Library.
+ *
+ * PHP native date functions use integer timestamps for computations.
+ * Because of this, dates are restricted to the years 1901-2038 on Unix
+ * and 1970-2038 on Windows due to integer overflow for dates beyond
+ * those years. This library overcomes these limitations by replacing the
+ * native function's signed integers (normally 32-bits) with PHP floating
+ * point numbers (normally 64-bits).
+ *
+ * Dates from 100 A.D. to 3000 A.D. and later have been tested.
+ * The minimum is 100 A.D. as <100 will invoke the 2 => 4 digit year
+ * conversion. The maximum is billions of years in the future, but this
+ * is a theoretical limit as the computation of that year would take too
+ * long with the current implementation of adodb_mktime().
+ *
+ * Replaces native functions as follows:
+ * - getdate()  with  adodb_getdate()
+ * - date()     with  adodb_date()
+ * - gmdate()   with  adodb_gmdate()
+ * - mktime()   with  adodb_mktime()
+ * - gmmktime() with  adodb_gmmktime()
+ * - strftime() with  adodb_strftime()
+ * - strftime() with  adodb_gmstrftime()
+ *
+ * The parameters are identical, except that adodb_date() accepts a subset
+ * of date()'s field formats. Mktime() will convert from local time to GMT,
+ * and date() will convert from GMT to local time, but daylight savings is
+ * not handled currently.
+ *
+ * To improve performance, the native date functions are used whenever
+ * possible, the library only switches to PHP code when the dates fall outside
+ * of the 32-bit signed integer range.
+ *
+ * This library is independent of the rest of ADOdb, and can be used
+ * as standalone code.
+ *
+ * GREGORIAN CORRECTION
+ *
+ * Pope Gregory shortened October of A.D. 1582 by ten days. Thursday,
+ * October 4, 1582 (Julian) was followed immediately by Friday, October 15,
+ * 1582 (Gregorian). We handle this correctly, so:
+ * adodb_mktime(0, 0, 0, 10, 15, 1582) - adodb_mktime(0, 0, 0, 10, 4, 1582)
+ * == 24 * 3600 (1 day)
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2003-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 
+/*
 =============================================================================
 
 FUNCTION DESCRIPTIONS
diff --git a/adodb-xmlschema.inc.php b/adodb-xmlschema.inc.php
index 98afde3e..7c4901df 100644
--- a/adodb-xmlschema.inc.php
+++ b/adodb-xmlschema.inc.php
@@ -1,21 +1,29 @@
 <?php
-// Copyright (c) 2004 ars Cognita Inc., all rights reserved
-/* ******************************************************************************
-    Released under both BSD license and Lesser GPL library license.
- 	Whenever there is any discrepancy between the two licenses,
- 	the BSD license will take precedence.
-*******************************************************************************/
 /**
+ * ADOdb XML Schema (v0.2).
+ *
  * xmlschema is a class that allows the user to quickly and easily
  * build a database on any ADOdb-supported platform using a simple
  * XML schema.
  *
- * Last Editor: $Author: jlim $
- * @author Richard Tango-Lowy & Dan Cech
- * @version $Revision: 1.12 $
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
  *
- * @package axmls
- * @tutorial getting_started.pkg
+ * @copyright 2004-2005 ars Cognita Inc., all rights reserved
+ * @copyright 2005-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ * @author Richard Tango-Lowy
+ * @author Dan Cech
  */
 
 /**
diff --git a/adodb-xmlschema03.inc.php b/adodb-xmlschema03.inc.php
index 37df6c2b..4ab6f89b 100644
--- a/adodb-xmlschema03.inc.php
+++ b/adodb-xmlschema03.inc.php
@@ -1,21 +1,29 @@
 <?php
-// Copyright (c) 2004-2005 ars Cognita Inc., all rights reserved
-/* ******************************************************************************
-    Released under both BSD license and Lesser GPL library license.
- 	Whenever there is any discrepancy between the two licenses,
- 	the BSD license will take precedence.
-*******************************************************************************/
 /**
+ * ADOdb XML Schema (v0.3).
+ *
  * xmlschema is a class that allows the user to quickly and easily
  * build a database on any ADOdb-supported platform using a simple
  * XML schema.
  *
- * Last Editor: $Author: jlim $
- * @author Richard Tango-Lowy & Dan Cech
- * @version $Revision: 1.62 $
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
  *
- * @package axmls
- * @tutorial getting_started.pkg
+ * @copyright 2004-2005 ars Cognita Inc., all rights reserved
+ * @copyright 2005-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ * @author Richard Tango-Lowy
+ * @author Dan Cech
  */
 
 /**
diff --git a/adodb.inc.php b/adodb.inc.php
index 1ede4b95..15a3da97 100644
--- a/adodb.inc.php
+++ b/adodb.inc.php
@@ -1,34 +1,22 @@
 <?php
-/*
- * Set tabs to 4 for best viewing.
+/**
+ * ADOdb Library main include file.
  *
- * Latest version is available at https://adodb.org/
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
  *
- * This is the main include file for ADOdb.
- * Database specific drivers are stored in the adodb/drivers/adodb-*.inc.php
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
  *
- * The ADOdb files are formatted so that doxygen can be used to generate documentation.
- * Doxygen is a documentation generation tool and can be downloaded from http://doxygen.org/
- */
-
-/**
-	\mainpage
-
-	@version   v5.21.1-dev  Unreleased
-	@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
-	@copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
-
-	Released under both BSD license and Lesser GPL library license. You can choose which license
-	you prefer.
-
-	PHP's database access functions are not standardised. This creates a need for a database
-	class library to hide the differences between the different database API's (encapsulate
-	the differences) so we can easily switch databases.
-
-	We currently support MySQL, Oracle, Microsoft SQL Server, Sybase, Sybase SQL Anywhere, DB2,
-	Informix, PostgreSQL, FrontBase, Interbase (Firebird and Borland variants), Foxpro, Access,
-	ADO, SAP DB, SQLite and ODBC. We have had successful reports of connecting to Progress and
-	other databases via ODBC.
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
  */
 
 if (!defined('_ADODB_LAYER')) {
diff --git a/datadict/datadict-access.inc.php b/datadict/datadict-access.inc.php
index 52fb81f5..b3f9fad0 100644
--- a/datadict/datadict-access.inc.php
+++ b/datadict/datadict-access.inc.php
@@ -1,16 +1,23 @@
 <?php
-
 /**
-  @version   v5.21.1-dev  Unreleased
-  @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
-  @copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence.
-
-  Set tabs to 4 for best viewing.
-
-*/
+ * Data Dictionary for Access.
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 
 // security - hide paths
 if (!defined('ADODB_DIR')) die();
diff --git a/datadict/datadict-db2.inc.php b/datadict/datadict-db2.inc.php
index 2014336b..9ac106bb 100644
--- a/datadict/datadict-db2.inc.php
+++ b/datadict/datadict-db2.inc.php
@@ -1,15 +1,24 @@
 <?php
 /**
-  @version   v5.21.1-dev  Unreleased
-  @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
-  @copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence.
+ * Data Dictionary for DB2.
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 
-  Set tabs to 4 for best viewing.
-
-*/
 // security - hide paths
 if (!defined('ADODB_DIR')) die();
 
diff --git a/datadict/datadict-firebird.inc.php b/datadict/datadict-firebird.inc.php
index f6771cab..ba80699d 100644
--- a/datadict/datadict-firebird.inc.php
+++ b/datadict/datadict-firebird.inc.php
@@ -1,16 +1,23 @@
 <?php
-
 /**
-  @version   v5.21.1-dev  Unreleased
-  @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
-  @copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence.
-
-  Set tabs to 4 for best viewing.
-
-*/
+ * Data Dictionary for Firebird.
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 
 // security - hide paths
 if (!defined('ADODB_DIR')) die();
diff --git a/datadict/datadict-generic.inc.php b/datadict/datadict-generic.inc.php
index da2aa939..1a60dbc2 100644
--- a/datadict/datadict-generic.inc.php
+++ b/datadict/datadict-generic.inc.php
@@ -1,16 +1,23 @@
 <?php
-
 /**
-  @version   v5.21.1-dev  Unreleased
-  @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
-  @copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence.
-
-  Set tabs to 4 for best viewing.
-
-*/
+ * Generic Data Dictionary.
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 
 // security - hide paths
 if (!defined('ADODB_DIR')) die();
diff --git a/datadict/datadict-ibase.inc.php b/datadict/datadict-ibase.inc.php
index 17e93a32..4310ded4 100644
--- a/datadict/datadict-ibase.inc.php
+++ b/datadict/datadict-ibase.inc.php
@@ -1,16 +1,23 @@
 <?php
-
 /**
-  @version   v5.21.1-dev  Unreleased
-  @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
-  @copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence.
-
-  Set tabs to 4 for best viewing.
-
-*/
+ * Data Dictionary for Interbase.
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 
 // security - hide paths
 if (!defined('ADODB_DIR')) die();
diff --git a/datadict/datadict-informix.inc.php b/datadict/datadict-informix.inc.php
index 54ca6023..9e151633 100644
--- a/datadict/datadict-informix.inc.php
+++ b/datadict/datadict-informix.inc.php
@@ -1,16 +1,23 @@
 <?php
-
 /**
-  @version   v5.21.1-dev  Unreleased
-  @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
-  @copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence.
-
-  Set tabs to 4 for best viewing.
-
-*/
+ * Data Dictionary for Informix.
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 
 // security - hide paths
 if (!defined('ADODB_DIR')) die();
diff --git a/datadict/datadict-mssql.inc.php b/datadict/datadict-mssql.inc.php
index eb38bbd6..17df9e39 100644
--- a/datadict/datadict-mssql.inc.php
+++ b/datadict/datadict-mssql.inc.php
@@ -1,16 +1,23 @@
 <?php
-
 /**
-  @version   v5.21.1-dev  Unreleased
-  @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
-  @copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence.
-
-  Set tabs to 4 for best viewing.
-
-*/
+ * Data Dictionary for Microsoft SQL Server (mssql)
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 
 /*
 In ADOdb, named quotes for MS SQL Server use ". From the MSSQL Docs:
diff --git a/datadict/datadict-mssqlnative.inc.php b/datadict/datadict-mssqlnative.inc.php
index 4f840683..59228cbe 100644
--- a/datadict/datadict-mssqlnative.inc.php
+++ b/datadict/datadict-mssqlnative.inc.php
@@ -1,16 +1,25 @@
 <?php
-
 /**
-  @version   v5.21.1-dev  Unreleased
-  @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
-  @copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence.
-
-  Set tabs to 4 for best viewing.
+ * Data Dictionary for Microsoft SQL Server native (mssqlnative)
 
-*/
+ * FileDescription
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 
 /*
 In ADOdb, named quotes for MS SQL Server use ". From the MSSQL Docs:
diff --git a/datadict/datadict-mysql.inc.php b/datadict/datadict-mysql.inc.php
index d05e7dd3..9efbba1f 100644
--- a/datadict/datadict-mysql.inc.php
+++ b/datadict/datadict-mysql.inc.php
@@ -1,16 +1,23 @@
 <?php
-
 /**
-  @version   v5.21.1-dev  Unreleased
-  @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
-  @copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence.
-
-  Set tabs to 4 for best viewing.
-
-*/
+ * Data Dictionary for MySQL.
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 
 // security - hide paths
 if (!defined('ADODB_DIR')) die();
diff --git a/datadict/datadict-oci8.inc.php b/datadict/datadict-oci8.inc.php
index 8a92e6b7..6d2cd244 100644
--- a/datadict/datadict-oci8.inc.php
+++ b/datadict/datadict-oci8.inc.php
@@ -1,16 +1,23 @@
 <?php
-
 /**
-  @version   v5.21.1-dev  Unreleased
-  @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
-  @copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence.
-
-  Set tabs to 4 for best viewing.
-
-*/
+ * Data Dictionary for Oracle (oci8)
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 
 // security - hide paths
 if (!defined('ADODB_DIR')) die();
diff --git a/datadict/datadict-postgres.inc.php b/datadict/datadict-postgres.inc.php
index 689646ee..219cc8a9 100644
--- a/datadict/datadict-postgres.inc.php
+++ b/datadict/datadict-postgres.inc.php
@@ -1,16 +1,23 @@
 <?php
-
 /**
-  @version   v5.21.1-dev  Unreleased
-  @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
-  @copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence.
-
-  Set tabs to 4 for best viewing.
-
-*/
+ * Data Dictionary for PostgreSQL.
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 
 // security - hide paths
 if (!defined('ADODB_DIR')) die();
diff --git a/datadict/datadict-sapdb.inc.php b/datadict/datadict-sapdb.inc.php
index 67491765..c469800f 100644
--- a/datadict/datadict-sapdb.inc.php
+++ b/datadict/datadict-sapdb.inc.php
@@ -1,17 +1,23 @@
 <?php
-
 /**
-  @version   v5.21.1-dev  Unreleased
-  @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
-  @copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence.
-
-  Set tabs to 4 for best viewing.
-
-  Modified from datadict-generic.inc.php for sapdb by RalfBecker-AT-outdoor-training.de
-*/
+ * Data Dictionary for SAP DB.
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 
 // security - hide paths
 if (!defined('ADODB_DIR')) die();
diff --git a/datadict/datadict-sqlite.inc.php b/datadict/datadict-sqlite.inc.php
index 3aa65f1d..d565f887 100644
--- a/datadict/datadict-sqlite.inc.php
+++ b/datadict/datadict-sqlite.inc.php
@@ -1,18 +1,23 @@
 <?php
-
 /**
-  @version   v5.21.1-dev  Unreleased
-  @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
-  @copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence.
-
-  Set tabs to 4 for best viewing.
-
-	SQLite datadict Andrei Besleaga
-
-*/
+ * Data Dictionary for SQLite.
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 
 // security - hide paths
 if (!defined('ADODB_DIR')) die();
diff --git a/datadict/datadict-sybase.inc.php b/datadict/datadict-sybase.inc.php
index 16e75ada..d6573dfa 100644
--- a/datadict/datadict-sybase.inc.php
+++ b/datadict/datadict-sybase.inc.php
@@ -1,16 +1,23 @@
 <?php
-
 /**
-  @version   v5.21.1-dev  Unreleased
-  @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
-  @copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence.
-
-  Set tabs to 4 for best viewing.
-
-*/
+ * Data Dictionary for SyBase.
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 
 // security - hide paths
 if (!defined('ADODB_DIR')) die();
diff --git a/drivers/adodb-access.inc.php b/drivers/adodb-access.inc.php
index 01a696fa..13461a35 100644
--- a/drivers/adodb-access.inc.php
+++ b/drivers/adodb-access.inc.php
@@ -1,17 +1,26 @@
 <?php
-/*
-@version   v5.21.1-dev  Unreleased
-@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
-@copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence. See License.txt.
-  Set tabs to 4 for best viewing.
-
-  Latest version is available at https://adodb.org/
+/**
+ * Microsoft Access driver.
+ *
+ * Requires ODBC. Works only on Microsoft Windows.
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 
-  Microsoft Access data driver. Requires ODBC. Works only on Microsoft Windows.
-*/
 if (!defined('_ADODB_ODBC_LAYER')) {
 	if (!defined('ADODB_DIR')) die();
 
diff --git a/drivers/adodb-ado.inc.php b/drivers/adodb-ado.inc.php
index 7d7e93c4..fc000cec 100644
--- a/drivers/adodb-ado.inc.php
+++ b/drivers/adodb-ado.inc.php
@@ -1,17 +1,25 @@
 <?php
-/*
-@version   v5.21.1-dev  Unreleased
-@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
-@copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence.
-Set tabs to 4 for best viewing.
-
-  Latest version is available at https://adodb.org/
-
-	Microsoft ADO data driver. Requires ADO. Works only on MS Windows.
-*/
+/**
+ * Microsoft ADO driver.
+ *
+ * Requires ADO. Works only on MS Windows.
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 
 // security - hide paths
 if (!defined('ADODB_DIR')) die();
diff --git a/drivers/adodb-ado5.inc.php b/drivers/adodb-ado5.inc.php
index 442ceaca..36f9c3b8 100644
--- a/drivers/adodb-ado5.inc.php
+++ b/drivers/adodb-ado5.inc.php
@@ -1,17 +1,25 @@
 <?php
-/*
-@version   v5.21.1-dev  Unreleased
-@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
-@copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence.
-Set tabs to 4 for best viewing.
-
-  Latest version is available at https://adodb.org/
-
-	Microsoft ADO data driver. Requires ADO. Works only on MS Windows. PHP5 compat version.
-*/
+/**
+ * Microsoft ADO driver (PHP5 compat version).
+ *
+ * Requires ADO. Works only on MS Windows.
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 
 // security - hide paths
 if (!defined('ADODB_DIR')) die();
diff --git a/drivers/adodb-ado_access.inc.php b/drivers/adodb-ado_access.inc.php
index bcd9b3d2..ad7ab38c 100644
--- a/drivers/adodb-ado_access.inc.php
+++ b/drivers/adodb-ado_access.inc.php
@@ -1,17 +1,25 @@
 <?php
-/*
-@version   v5.21.1-dev  Unreleased
-@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
-@copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
-Released under both BSD license and Lesser GPL library license.
-Whenever there is any discrepancy between the two licenses,
-the BSD license will take precedence. See License.txt.
-Set tabs to 4 for best viewing.
-
-  Latest version is available at https://adodb.org/
-
-	Microsoft Access ADO data driver. Requires ADO and ODBC. Works only on MS Windows.
-*/
+/**
+ * Microsoft Access ADO driver.
+ *
+ * Requires ADO and ODBC. Works only on MS Windows.
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 
 // security - hide paths
 if (!defined('ADODB_DIR')) die();
diff --git a/drivers/adodb-ado_mssql.inc.php b/drivers/adodb-ado_mssql.inc.php
index 0ae965cf..d0e9c196 100644
--- a/drivers/adodb-ado_mssql.inc.php
+++ b/drivers/adodb-ado_mssql.inc.php
@@ -1,21 +1,25 @@
 <?php
-/*
-@version   v5.21.1-dev  Unreleased
-@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
-@copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence.
-Set tabs to 4 for best viewing.
-
-  Latest version is available at https://adodb.org/
-
-  Microsoft SQL Server ADO data driver. Requires ADO and MSSQL client.
-  Works only on MS Windows.
-
-  Warning: Some versions of PHP (esp PHP4) leak memory when ADO/COM is used.
-  Please check http://bugs.php.net/ for more info.
-*/
+/**
+ * Microsoft SQL Server ADO driver.
+ *
+ * Requires ADO and MSSQL client. Works only on MS Windows.
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 
 // security - hide paths
 if (!defined('ADODB_DIR')) die();
diff --git a/drivers/adodb-ads.inc.php b/drivers/adodb-ads.inc.php
index c87f5e25..b9d4adb5 100644
--- a/drivers/adodb-ads.inc.php
+++ b/drivers/adodb-ads.inc.php
@@ -1,20 +1,29 @@
 <?php
-/*
-  (c) 2000-2014 John Lim (jlim#natsoft.com.my). All rights reserved.
-  Portions Copyright (c) 2007-2009, iAnywhere Solutions, Inc.
-  All rights reserved. All unpublished rights reserved.
-
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence.
-
-Set tabs to 4 for best viewing.
-
-
-NOTE: This driver requires the Advantage PHP client libraries, which
-      can be downloaded for free via:
-      http://devzone.advantagedatabase.com/dz/content.aspx?key=20
+/**
+ * ADOdb driver for ADS.
+ *
+ * NOTE: This driver requires the Advantage PHP client libraries, which
+ * can be downloaded for free via:
+ * @link http://devzone.advantagedatabase.com/dz/content.aspx?key=20
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 
+/*
 DELPHI FOR PHP USERS:
       The following steps can be taken to utilize this driver from the
       CodeGear Delphi for PHP product:
@@ -35,6 +44,7 @@ DELPHI FOR PHP USERS:
             Database object's DriverName property.
 
 */
+
 // security - hide paths
 if (!defined('ADODB_DIR')) {
 	die();
diff --git a/drivers/adodb-borland_ibase.inc.php b/drivers/adodb-borland_ibase.inc.php
index d1194739..da2c7618 100644
--- a/drivers/adodb-borland_ibase.inc.php
+++ b/drivers/adodb-borland_ibase.inc.php
@@ -1,18 +1,25 @@
 <?php
-/*
-@version   v5.21.1-dev  Unreleased
-@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
-@copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence.
-Set tabs to 4 for best viewing.
-
-  Latest version is available at https://adodb.org/
-
-  Support Borland Interbase 6.5 and later
-
-*/
+/**
+ * Borland Interbase driver.
+ *
+ * Support Borland Interbase 6.5 and later
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 
 // security - hide paths
 if (!defined('ADODB_DIR')) die();
diff --git a/drivers/adodb-csv.inc.php b/drivers/adodb-csv.inc.php
index 8261ffb8..8a59626e 100644
--- a/drivers/adodb-csv.inc.php
+++ b/drivers/adodb-csv.inc.php
@@ -1,21 +1,30 @@
 <?php
-/*
-@version   v5.21.1-dev  Unreleased
-@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
-@copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence.
-  Set tabs to 4.
-
-  Currently unsupported: MetaDatabases, MetaTables and MetaColumns, and also inputarr in Execute.
-  Native types have been converted to MetaTypes.
-  Transactions not supported yet.
-
-  Limitation of url length. For IIS, see MaxClientRequestBuffer registry value.
-
-	  http://support.microsoft.com/default.aspx?scid=kb;en-us;260694
-*/
+/**
+ * FileDescription
+ *
+ * Currently unsupported: MetaDatabases, MetaTables and MetaColumns,
+ * and also inputarr in Execute.
+ * Native types have been converted to MetaTypes.
+ * Transactions not supported yet.
+ *
+ * Limitation of url length. For IIS, see MaxClientRequestBuffer registry value.
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 
 // security - hide paths
 if (!defined('ADODB_DIR')) die();
diff --git a/drivers/adodb-db2.inc.php b/drivers/adodb-db2.inc.php
index 27c3970c..8f616fa6 100644
--- a/drivers/adodb-db2.inc.php
+++ b/drivers/adodb-db2.inc.php
@@ -1,36 +1,40 @@
 <?php
 /**
-  @version   v5.21.1-dev  Unreleased
-  @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
-  @copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence.
-
-  Set tabs to 4 for best viewing.
-
-* Driver for use with IBM DB2 Native Client
-*
-* Originally DB2 drivers were dependent on an ODBC driver, and some installations
-* may still use that. To use an ODBC driver connection, use the odbc_db2
-* ADOdb driver. For Linux, you need the 'ibm_db2' PECL extension for PHP,
-* For Windows, you need to locate an appropriate version of the php_ibm_db2.dll,
-* as well as the IBM data server client software.
-* This is basically a full rewrite of the original driver, for information
-* about all the changes, see the update information on the ADOdb website
-* for version 5.21.0
-*
-* @link http://pecl.php.net/package/ibm_db2 Pecl Extension For DB2
-* @author Mark Newnham
-*/
+ * IBM DB2 Native Client driver.
+ *
+ * Originally DB2 drivers were dependent on an ODBC driver, and some installations
+ * may still use that. To use an ODBC driver connection, use the odbc_db2
+ * ADOdb driver. For Linux, you need the 'ibm_db2' PECL extension for PHP,
+ * For Windows, you need to locate an appropriate version of the php_ibm_db2.dll,
+ * as well as the IBM data server client software.
+ * This is basically a full rewrite of the original driver, for information
+ * about all the changes, see the update information on the ADOdb website
+ * for version 5.21.0.
+ *
+ * @link http://pecl.php.net/package/ibm_db2 PECL Extension For DB2
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ * @author Mark Newnham
+ */
 
 // security - hide paths
 if (!defined('ADODB_DIR')) die();
 
-  define("_ADODB_DB2_LAYER", 2 );
-
-/*--------------------------------------------------------------------
-----------------------------------------------------------------------*/
+define("_ADODB_DB2_LAYER", 2 );
 
 
 class ADODB_db2 extends ADOConnection {
diff --git a/drivers/adodb-db2oci.inc.php b/drivers/adodb-db2oci.inc.php
index c3a4c4bc..eea63d94 100644
--- a/drivers/adodb-db2oci.inc.php
+++ b/drivers/adodb-db2oci.inc.php
@@ -1,17 +1,27 @@
 <?php
-/*
-@version   v5.21.1-dev  Unreleased
-@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
-@copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence.
-Set tabs to 4 for best viewing.
-
-  Latest version is available at https://adodb.org/
-
-  Microsoft Visual FoxPro data driver. Requires ODBC. Works only on MS Windows.
-*/
+/**
+ * IBM DB2 / Oracle compatibility driver.
+ *
+ * This driver re-maps ibm :0 bind variables to oracle compatible ? variables.
+ *
+ * @deprecated
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 
 // security - hide paths
 if (!defined('ADODB_DIR')) die();
diff --git a/drivers/adodb-db2ora.inc.php b/drivers/adodb-db2ora.inc.php
index 8642a55d..d343a8ae 100644
--- a/drivers/adodb-db2ora.inc.php
+++ b/drivers/adodb-db2ora.inc.php
@@ -1,17 +1,28 @@
 <?php
-/*
-@version   v5.21.1-dev  Unreleased
-@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
-@copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence.
-Set tabs to 4 for best viewing.
-
-  Latest version is available at https://adodb.org/
-
-  Microsoft Visual FoxPro data driver. Requires ODBC. Works only on MS Windows.
-*/
+/**
+ * IBM DB2 / Oracle compatibility driver.
+ *
+ * This driver provides undocumented bind variable mapping from ibm to oracle.
+ * The functionality appears to overlap the db2_oci driver.
+ *
+ * @deprecated
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 
 // security - hide paths
 if (!defined('ADODB_DIR')) die();
diff --git a/drivers/adodb-fbsql.inc.php b/drivers/adodb-fbsql.inc.php
index 0efdf817..0aa85e64 100644
--- a/drivers/adodb-fbsql.inc.php
+++ b/drivers/adodb-fbsql.inc.php
@@ -1,14 +1,24 @@
 <?php
-/*
- @version   v5.21.1-dev  Unreleased
- @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
- @copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
- Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence.
- Contribution by Frank M. Kromann <frank@frontbase.com>.
-  Set tabs to 8.
-*/
+/**
+ * Frontbase driver.
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ * @author Frank M. Kromann <frank@frontbase.com>
+ */
 
 // security - hide paths
 if (!defined('ADODB_DIR')) die();
diff --git a/drivers/adodb-firebird.inc.php b/drivers/adodb-firebird.inc.php
index 37b5af09..09b7545c 100644
--- a/drivers/adodb-firebird.inc.php
+++ b/drivers/adodb-firebird.inc.php
@@ -1,18 +1,25 @@
 <?php
-/*
-@version   v5.21.1-dev  Unreleased
-@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
-@copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence.
-Set tabs to 4 for best viewing.
-
-  Latest version is available at https://adodb.org/
-
-  firebird data driver. Requires firebird client. Works on Windows and Unix.
-
-*/
+/**
+ * Firebird driver.
+ *
+ * Requires firebird client. Works on Windows and Unix.
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 
 // security - hide paths
 if (!defined('ADODB_DIR')) die();
diff --git a/drivers/adodb-ibase.inc.php b/drivers/adodb-ibase.inc.php
index c6aa3b64..81ab29b5 100644
--- a/drivers/adodb-ibase.inc.php
+++ b/drivers/adodb-ibase.inc.php
@@ -1,29 +1,25 @@
 <?php
-/*
-@version   v5.21.1-dev  Unreleased
-@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
-@copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence.
-
-  Latest version is available at https://adodb.org/
-
-  Interbase data driver. Requires interbase client. Works on Windows and Unix.
-
-  3 Jan 2002 -- suggestions by Hans-Peter Oeri <kampfcaspar75@oeri.ch>
-  	changed transaction handling and added experimental blob stuff
-
-  Docs to interbase at the website
-   http://www.synectics.co.za/php3/tutorial/IB_PHP3_API.html
-
-  To use gen_id(), see
-   http://www.volny.cz/iprenosil/interbase/ip_ib_code.htm#_code_creategen
-
-   $rs = $conn->Execute('select gen_id(adodb,1) from rdb$database');
-   $id = $rs->fields[0];
-   $conn->Execute("insert into table (id, col1,...) values ($id, $val1,...)");
-*/
+/**
+ * Interbase driver.
+ *
+ * Requires interbase client. Works on Windows and Unix.
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 
 // security - hide paths
 if (!defined('ADODB_DIR')) die();
diff --git a/drivers/adodb-informix.inc.php b/drivers/adodb-informix.inc.php
index 150832e4..8e99137c 100644
--- a/drivers/adodb-informix.inc.php
+++ b/drivers/adodb-informix.inc.php
@@ -1,19 +1,27 @@
 <?php
 /**
-* @version   v5.21.1-dev  Unreleased
-* @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
-* @copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
-* Released under both BSD license and Lesser GPL library license.
-* Whenever there is any discrepancy between the two licenses,
-* the BSD license will take precedence.
-*
-* Set tabs to 4 for best viewing.
-*
-* Latest version is available at https://adodb.org/
-*
-* Informix 9 driver that supports SELECT FIRST
-*
-*/
+ * Informix 9 driver.
+ *
+ * Supports SELECT FIRST.
+ *
+ * @deprecated
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 
 // security - hide paths
 if (!defined('ADODB_DIR')) die();
diff --git a/drivers/adodb-informix72.inc.php b/drivers/adodb-informix72.inc.php
index 393ac2d3..a9c43e23 100644
--- a/drivers/adodb-informix72.inc.php
+++ b/drivers/adodb-informix72.inc.php
@@ -1,20 +1,27 @@
 <?php
-/*
-@version   v5.21.1-dev  Unreleased
-@copyright (c) 2000-2013 John Lim. All rights reserved.
-@copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence.
-  Set tabs to 4 for best viewing.
-
-  Latest version is available at https://adodb.org/
-
-  Informix port by Mitchell T. Young (mitch@youngfamily.org)
-
-  Further mods by "Samuel CARRIERE" <samuel_carriere@hotmail.com>
-
-*/
+/**
+ * Informix driver.
+ *
+ * @deprecated
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ * @author Mitchell T. Young <mitch@youngfamily.org>
+ * @author Samuel Carriere <samuel_carriere@hotmail.com>
+ */
 
 // security - hide paths
 if (!defined('ADODB_DIR')) die();
diff --git a/drivers/adodb-ldap.inc.php b/drivers/adodb-ldap.inc.php
index 5572f2d6..323b3585 100644
--- a/drivers/adodb-ldap.inc.php
+++ b/drivers/adodb-ldap.inc.php
@@ -1,20 +1,26 @@
 <?php
-/*
-  @version   v5.21.1-dev  Unreleased
-  @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
-  @copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
-   Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence.
-  Set tabs to 8.
-
-  Revision 1: (02/25/2005) Updated codebase to include the _inject_bind_options function. This allows
-  users to access the options in the ldap_set_option function appropriately. Most importantly
-  LDAP Version 3 is now supported. See the examples for more information. Also fixed some minor
-  bugs that surfaced when PHP error levels were set high.
-
-  Joshua Eldridge (joshuae74#hotmail.com)
-*/
+/**
+ * LDAP driver.
+ *
+ * Provides a subset of ADOdb commands, allowing read-only access to an LDAP database.
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ * @author Joshua Eldridge <joshuae74@hotmail.com>
+ */
 
 // security - hide paths
 if (!defined('ADODB_DIR')) die();
diff --git a/drivers/adodb-mssql.inc.php b/drivers/adodb-mssql.inc.php
index 07f9fcbd..3de3f8d3 100644
--- a/drivers/adodb-mssql.inc.php
+++ b/drivers/adodb-mssql.inc.php
@@ -1,21 +1,25 @@
 <?php
-/*
-@version   v5.21.1-dev  Unreleased
-@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
-@copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence.
-Set tabs to 4 for best viewing.
-
-  Latest version is available at https://adodb.org/
-
-  Native mssql driver. Requires mssql client. Works on Windows.
-  To configure for Unix, see
-   	http://phpbuilder.com/columns/alberto20000919.php3
-
-*/
-
+/**
+ * Native MSSQL driver.
+ *
+ * Requires mssql client. Works on Windows.
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 
 // security - hide paths
 if (!defined('ADODB_DIR')) die();
diff --git a/drivers/adodb-mssql_n.inc.php b/drivers/adodb-mssql_n.inc.php
index b8c650f1..236c1546 100644
--- a/drivers/adodb-mssql_n.inc.php
+++ b/drivers/adodb-mssql_n.inc.php
@@ -1,47 +1,27 @@
 <?php
-
-/// $Id $
-
-///////////////////////////////////////////////////////////////////////////
-//                                                                       //
-// NOTICE OF COPYRIGHT                                                   //
-//                                                                       //
-// ADOdb  - Database Abstraction Library for PHP                         //
-//                                                                       //
-// Latest version is available at https://adodb.org                       //
-//                                                                       //
-// Copyright (c) 2000-2014 John Lim (jlim\@natsoft.com.my)               //
-//          All rights reserved.                                         //
-//          Released under both BSD license and LGPL library license.    //
-//          Whenever there is any discrepancy between the two licenses,  //
-//          the BSD license will take precedence                         //
-//                                                                       //
-// Moodle - Modular Object-Oriented Dynamic Learning Environment         //
-//          http://moodle.com                                            //
-//                                                                       //
-// Copyright (C) 2001-3001 Martin Dougiamas        http://dougiamas.com  //
-//           (C) 2001-3001 Eloy Lafuente (stronk7) http://contiento.com  //
-//                                                                       //
-// This program is free software; you can redistribute it and/or modify  //
-// it under the terms of the GNU General Public License as published by  //
-// the Free Software Foundation; either version 2 of the License, or     //
-// (at your option) any later version.                                   //
-//                                                                       //
-// This program is distributed in the hope that it will be useful,       //
-// but WITHOUT ANY WARRANTY; without even the implied warranty of        //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
-// GNU General Public License for more details:                          //
-//                                                                       //
-//          http://www.gnu.org/copyleft/gpl.html                         //
-//                                                                       //
-///////////////////////////////////////////////////////////////////////////
-
 /**
-*  MSSQL Driver with auto-prepended "N" for correct unicode storage
-*  of SQL literal strings. Intended to be used with MSSQL drivers that
-*  are sending UCS-2 data to MSSQL (FreeTDS and ODBTP) in order to get
-*  true cross-db compatibility from the application point of view.
-*/
+ * MSSQL Driver with auto-prepended "N" for correct unicode storage of SQL literal strings.
+ *
+ * Intended to be used with MSSQL drivers that are sending UCS-2 data to MSSQL
+ * (FreeTDS and ODBTP) in order to get true cross-db compatibility from the
+ * application point of view.
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 
 // security - hide paths
 if (!defined('ADODB_DIR')) die();
@@ -60,7 +40,7 @@ class ADODB_mssql_n extends ADODB_mssql {
 		return ADODB_mssql::_query($sql,$inputarr);
 	}
 
-         /**
+	/**
      * This function will intercept all the literals used in the SQL, prepending the "N" char to them
      * in order to allow mssql to store properly data sent in the correct UCS-2 encoding (by freeTDS
      * and ODBTP) keeping SQL compatibility at ADOdb level (instead of hacking every project to add
diff --git a/drivers/adodb-mssqlnative.inc.php b/drivers/adodb-mssqlnative.inc.php
index 11a5b632..1852f2c0 100644
--- a/drivers/adodb-mssqlnative.inc.php
+++ b/drivers/adodb-mssqlnative.inc.php
@@ -1,24 +1,26 @@
 <?php
-/*
-@version   v5.21.1-dev  Unreleased
-@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
-@copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence.
-Set tabs to 4 for best viewing.
-
-  Latest version is available at https://adodb.org/
-
-  Native mssql driver. Requires mssql client. Works on Windows.
-    http://www.microsoft.com/sql/technologies/php/default.mspx
-  To configure for Unix, see
-   	http://phpbuilder.com/columns/alberto20000919.php3
-
-    $stream = sqlsrv_get_field($stmt, $index, SQLSRV_SQLTYPE_STREAM(SQLSRV_ENC_BINARY));
-    stream_filter_append($stream, "convert.iconv.ucs-2/utf-8"); // Voila, UTF-8 can be read directly from $stream
-
-*/
+/**
+ * Native MSSQL driver.
+ *
+ * Requires mssql client. Works on Windows.
+ * https://docs.microsoft.com/sql/connect/php
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 
 // security - hide paths
 if (!defined('ADODB_DIR')) die();
diff --git a/drivers/adodb-mssqlpo.inc.php b/drivers/adodb-mssqlpo.inc.php
index 48e99cce..f2d2f6fb 100644
--- a/drivers/adodb-mssqlpo.inc.php
+++ b/drivers/adodb-mssqlpo.inc.php
@@ -1,29 +1,27 @@
 <?php
 /**
-* @version   v5.21.1-dev  Unreleased
-* @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
-* @copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
-* Released under both BSD license and Lesser GPL library license.
-* Whenever there is any discrepancy between the two licenses,
-* the BSD license will take precedence.
-*
-* Set tabs to 4 for best viewing.
-*
-* Latest version is available at https://adodb.org/
-*
-*  Portable MSSQL Driver that supports || instead of +
-*
-*/
+ * Portable MSSQL Driver that supports || instead of +.
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 
 // security - hide paths
 if (!defined('ADODB_DIR')) die();
 
-
-/*
-	The big difference between mssqlpo and it's parent mssql is that mssqlpo supports
-	the more standard || string concatenation operator.
-*/
-
 include_once(ADODB_DIR.'/drivers/adodb-mssql.inc.php');
 
 class ADODB_mssqlpo extends ADODB_mssql {
diff --git a/drivers/adodb-mysql.inc.php b/drivers/adodb-mysql.inc.php
index 258570a9..ed5570c9 100644
--- a/drivers/adodb-mysql.inc.php
+++ b/drivers/adodb-mysql.inc.php
@@ -1,22 +1,30 @@
 <?php
-/*
-@version   v5.21.1-dev  Unreleased
-@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
-@copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence.
-  Set tabs to 8.
-
-  This driver only supports the original non-transactional MySQL driver. It
-  is deprecated in PHP version 5.5 and removed in PHP version 7. It is deprecated
-  as of ADOdb version 5.20.0. Use the mysqli driver instead, which supports both
-  transactional and non-transactional updates
-
-  Requires mysql client. Works on Windows and Unix.
-
- 28 Feb 2001: MetaColumns bug fix - suggested by  Freek Dijkstra (phpeverywhere@macfreek.com)
-*/
+/**
+ * MySQL driver
+ *
+ * @deprecated
+ *
+ * This driver only supports the original non-transactional MySQL driver,
+ * which was deprecated in PHP version 5.5 and removed in PHP version 7.
+ * It is deprecated as of ADOdb version 5.20.0, use the mysqli driver
+ * instead, which supports both transactional and non-transactional updates.
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 
 // security - hide paths
 if (!defined('ADODB_DIR')) die();
diff --git a/drivers/adodb-mysqli.inc.php b/drivers/adodb-mysqli.inc.php
index d47281b2..46d53618 100644
--- a/drivers/adodb-mysqli.inc.php
+++ b/drivers/adodb-mysqli.inc.php
@@ -1,23 +1,28 @@
 <?php
-/*
-@version   v5.21.1-dev  Unreleased
-@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
-@copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence.
-  Set tabs to 8.
-
-  This is the preferred driver for MySQL connections, and supports both transactional
-  and non-transactional table types. You can use this as a drop-in replacement for both
-  the mysql and mysqlt drivers. As of ADOdb Version 5.20.0, all other native MySQL drivers
-  are deprecated
-
-  Requires mysql client. Works on Windows and Unix.
-
-21 October 2003: MySQLi extension implementation by Arjen de Rijke (a.de.rijke@xs4all.nl)
-Based on adodb 3.40
-*/
+/**
+ * MySQL improved driver (mysqli)
+ *
+ * This is the preferred driver for MySQL connections. It  supports both
+ * transactional and non-transactional table types. You can use this as a
+ * drop-in replacement for both the mysql and mysqlt drivers.
+ * As of ADOdb Version 5.20.0, all other native MySQL drivers are deprecated.
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 
 // security - hide paths
 if (!defined('ADODB_DIR')) {
diff --git a/drivers/adodb-mysqlpo.inc.php b/drivers/adodb-mysqlpo.inc.php
index eb2ca6bd..8aa7779a 100644
--- a/drivers/adodb-mysqlpo.inc.php
+++ b/drivers/adodb-mysqlpo.inc.php
@@ -1,24 +1,30 @@
 <?php
-
-/*
-@version   v5.21.1-dev  Unreleased
-@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
-@copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence.
-  Set tabs to 8.
-
-  MySQL code that supports transactions. For MySQL 3.23 or later.
-  Code from James Poon <jpoon88@yahoo.com>
-
-  This driver extends the deprecated mysql driver, and was originally designed to be a
-  portable driver in the same manner as oci8po and mssqlpo. Its functionality
-  is exactly duplicated in the mysqlt driver, which is itself deprecated.
-  This driver will be removed in ADOdb version 6.0.0.
-
-  Requires mysql client. Works on Windows and Unix.
-*/
+/**
+ * Portable MySQL driver
+ *
+ * @deprecated
+ *
+ * Extends the deprecated mysql driver, and was originally designed to be a
+ * portable driver in the same manner as oci8po and mssqlpo. Its functionality
+ * is exactly duplicated in the mysqlt driver, which is itself deprecated.
+ * This driver will be removed in ADOdb version 6.0.0.
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 
 // security - hide paths
 if (!defined('ADODB_DIR')) die();
diff --git a/drivers/adodb-mysqlt.inc.php b/drivers/adodb-mysqlt.inc.php
index 9dbf8eef..cccd93f8 100644
--- a/drivers/adodb-mysqlt.inc.php
+++ b/drivers/adodb-mysqlt.inc.php
@@ -1,21 +1,30 @@
 <?php
-
-/*
-@version   v5.21.1-dev  Unreleased
-@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
-@copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence.
-  Set tabs to 8.
-
-  This driver only supports the original MySQL driver in transactional mode. It
-  is deprecated in PHP version 5.5 and removed in PHP version 7. It is deprecated
-  as of ADOdb version 5.20.0. Use the mysqli driver instead, which supports both
-  transactional and non-transactional updates
-
-  Requires mysql client. Works on Windows and Unix.
-*/
+/**
+ * MySQL driver in transactional mode
+ *
+ * @deprecated
+ *
+ * This driver only supports the original MySQL driver in transactional mode. It
+ * is deprecated in PHP version 5.5 and removed in PHP version 7. It is deprecated
+ * as of ADOdb version 5.20.0. Use the mysqli driver instead, which supports both
+ * transactional and non-transactional updates
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 
 // security - hide paths
 if (!defined('ADODB_DIR')) die();
diff --git a/drivers/adodb-netezza.inc.php b/drivers/adodb-netezza.inc.php
index c2b01c61..dc7c58e4 100644
--- a/drivers/adodb-netezza.inc.php
+++ b/drivers/adodb-netezza.inc.php
@@ -1,21 +1,35 @@
 <?php
-/*
-  @version   v5.21.1-dev  Unreleased
-  @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
-  @copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
+/**
+ * Netezza Driver
+ *
+ * @link https://www.ibm.com/products/netezza
+ * Based on the previous postgres drivers. Major Additions/Changes:
+ * - MetaDatabasesSQL, MetaTablesSQL, MetaColumnsSQL
+ *   Note: You have to have admin privileges to access the system tables
+ * - Removed non-working keys code (Netezza has no concept of keys)
+ * - Fixed the way data types and lengths are returned in MetaColumns()
+ *   as well as added the default lengths for certain types
+ * - Updated public variables for Netezza
+ * TODO: Still need to remove blob functions, as Netezza doesn't support blob
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ * @author Josh Eldridge <joshuae74@hotmail.com>
+ */
 
-  First cut at the Netezza Driver by Josh Eldridge joshuae74#hotmail.com
- Based on the previous postgres drivers.
- http://www.netezza.com/
- Major Additions/Changes:
-    MetaDatabasesSQL, MetaTablesSQL, MetaColumnsSQL
-    Note: You have to have admin privileges to access the system tables
-    Removed non-working keys code (Netezza has no concept of keys)
-    Fixed the way data types and lengths are returned in MetaColumns()
-    as well as added the default lengths for certain types
-    Updated public variables for Netezza
-    Still need to remove blob functions, as Netezza doesn't support blob
-*/
 // security - hide paths
 if (!defined('ADODB_DIR')) die();
 
diff --git a/drivers/adodb-oci8.inc.php b/drivers/adodb-oci8.inc.php
index a05a3402..4dc93b1c 100644
--- a/drivers/adodb-oci8.inc.php
+++ b/drivers/adodb-oci8.inc.php
@@ -1,20 +1,25 @@
 <?php
-/*
-
-  @version   v5.21.1-dev  Unreleased
-  @copyright (c) 2000-2013 John Lim. All rights reserved.
-  @copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
-
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence.
-
-  Latest version is available at https://adodb.org/
-
-  Code contributed by George Fourlanos <fou@infomap.gr>
-
-  13 Nov 2000 jlim - removed all ora_* references.
-*/
+/**
+ * FileDescription
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ * @author John Lim
+ * @author George Fourlanos <fou@infomap.gr>
+ */
 
 // security - hide paths
 if (!defined('ADODB_DIR')) die();
diff --git a/drivers/adodb-oci805.inc.php b/drivers/adodb-oci805.inc.php
index 0d915661..01958282 100644
--- a/drivers/adodb-oci805.inc.php
+++ b/drivers/adodb-oci805.inc.php
@@ -1,18 +1,27 @@
 <?php
 /**
- * @version   v5.21.1-dev  Unreleased
- * @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
- * @copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
- * Released under both BSD license and Lesser GPL library license.
- * Whenever there is any discrepancy between the two licenses,
- * the BSD license will take precedence.
+ * Oracle 8.0.5 (oci8) driver
  *
- * Set tabs to 4 for best viewing.
+ * @deprecated
  *
- * Latest version is available at https://adodb.org/
+ * Optimizes selectLimit() performance with FIRST_ROWS hint.
  *
- * Oracle 8.0.5 driver
-*/
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 
 // security - hide paths
 if (!defined('ADODB_DIR')) die();
diff --git a/drivers/adodb-oci8po.inc.php b/drivers/adodb-oci8po.inc.php
index a7a08d57..50630cad 100644
--- a/drivers/adodb-oci8po.inc.php
+++ b/drivers/adodb-oci8po.inc.php
@@ -1,23 +1,28 @@
 <?php
-/*
-@version   v5.21.1-dev  Unreleased
-@copyright (c) 2000-2013 John Lim. All rights reserved.
-@copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence.
-
-  Latest version is available at https://adodb.org/
-
-  Portable version of oci8 driver, to make it more similar to other database drivers.
-  The main differences are
-
-   1. that the OCI_ASSOC names are in lowercase instead of uppercase.
-   2. bind variables are mapped using ? instead of :<bindvar>
-
-   Should some emulation of RecordCount() be implemented?
-
-*/
+/**
+ * Portable version of Oracle oci8 driver
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * Portable version of oci8 driver, to make it more similar to other database
+ * drivers. The main differences are
+ * 1. that the OCI_ASSOC names are in lowercase instead of uppercase.
+ * 2. bind variables are mapped using ? instead of :<bindvar>
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 
 // security - hide paths
 if (!defined('ADODB_DIR')) die();
diff --git a/drivers/adodb-oci8quercus.inc.php b/drivers/adodb-oci8quercus.inc.php
index 67e34eff..f9312c9d 100644
--- a/drivers/adodb-oci8quercus.inc.php
+++ b/drivers/adodb-oci8quercus.inc.php
@@ -1,23 +1,23 @@
 <?php
-/*
-@version   v5.21.1-dev  Unreleased
-@copyright (c) 2000-2013 John Lim. All rights reserved.
-@copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence.
-
-  Latest version is available at https://adodb.org/
-
-  Portable version of oci8 driver, to make it more similar to other database drivers.
-  The main differences are
-
-   1. that the OCI_ASSOC names are in lowercase instead of uppercase.
-   2. bind variables are mapped using ? instead of :<bindvar>
-
-   Should some emulation of RecordCount() be implemented?
-
-*/
+/**
+ * Oracle "quercus" driver.
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 
 // security - hide paths
 if (!defined('ADODB_DIR')) die();
diff --git a/drivers/adodb-odbc.inc.php b/drivers/adodb-odbc.inc.php
index 150a33d9..a9705e2d 100644
--- a/drivers/adodb-odbc.inc.php
+++ b/drivers/adodb-odbc.inc.php
@@ -1,17 +1,24 @@
 <?php
-/*
-@version   v5.21.1-dev  Unreleased
-@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
-@copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence.
-Set tabs to 4 for best viewing.
-
-  Latest version is available at https://adodb.org/
+/**
+ * Base ODBC driver
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 
-  Requires ODBC. Works on Windows and Unix.
-*/
 // security - hide paths
 if (!defined('ADODB_DIR')) die();
 
diff --git a/drivers/adodb-odbc_db2.inc.php b/drivers/adodb-odbc_db2.inc.php
index 449c3568..8f0e60cb 100644
--- a/drivers/adodb-odbc_db2.inc.php
+++ b/drivers/adodb-odbc_db2.inc.php
@@ -1,92 +1,23 @@
 <?php
-/*
-@version   v5.21.1-dev  Unreleased
-@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
-@copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence.
-Set tabs to 4 for best viewing.
-
-  Latest version is available at https://adodb.org/
-
-  DB2 data driver. Requires ODBC.
-
-From phpdb list:
-
-Hi Andrew,
-
-thanks a lot for your help. Today we discovered what
-our real problem was:
-
-After "playing" a little bit with the php-scripts that try
-to connect to the IBM DB2, we set the optional parameter
-Cursortype when calling odbc_pconnect(....).
-
-And the exciting thing: When we set the cursor type
-to SQL_CUR_USE_ODBC Cursor Type, then
-the whole query speed up from 1 till 10 seconds
-to 0.2 till 0.3 seconds for 100 records. Amazing!!!
-
-Therefore, PHP is just almost fast as calling the DB2
-from Servlets using JDBC (don't take too much care
-about the speed at whole: the database was on a
-completely other location, so the whole connection
-was made over a slow network connection).
-
-I hope this helps when other encounter the same
-problem when trying to connect to DB2 from
-PHP.
-
-Kind regards,
-Christian Szardenings
-
-2 Oct 2001
-Mark Newnham has discovered that the SQL_CUR_USE_ODBC is not supported by
-IBM's DB2 ODBC driver, so this must be a 3rd party ODBC driver.
-
-From the IBM CLI Reference:
-
-SQL_ATTR_ODBC_CURSORS (DB2 CLI v5)
-This connection attribute is defined by ODBC, but is not supported by DB2
-CLI. Any attempt to set or get this attribute will result in an SQLSTATE of
-HYC00 (Driver not capable).
-
-A 32-bit option specifying how the Driver Manager uses the ODBC cursor
-library.
-
-So I guess this means the message [above] was related to using a 3rd party
-odbc driver.
-
-Setting SQL_CUR_USE_ODBC
-========================
-To set SQL_CUR_USE_ODBC for drivers that require it, do this:
-
-$db = NewADOConnection('odbc_db2');
-$db->curMode = SQL_CUR_USE_ODBC;
-$db->Connect($dsn, $userid, $pwd);
-
-
-
-USING CLI INTERFACE
-===================
-
-I have had reports that the $host and $database params have to be reversed in
-Connect() when using the CLI interface. From Halmai Csongor csongor.halmai#nexum.hu:
-
-> The symptom is that if I change the database engine from postgres or any other to DB2 then the following
-> connection command becomes wrong despite being described this version to be correct in the docs.
->
-> $connection_object->Connect( $DATABASE_HOST, $DATABASE_AUTH_USER_NAME, $DATABASE_AUTH_PASSWORD, $DATABASE_NAME )
->
-> In case of DB2 I had to swap the first and last arguments in order to connect properly.
-
-
-System Error 5
-==============
-IF you get a System Error 5 when trying to Connect/Load, it could be a permission problem. Give the user connecting
-to DB2 full rights to the DB2 SQLLIB directory, and place the user in the DBUSERS group.
-*/
+/**
+ * DB2 driver via ODBC
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 
 // security - hide paths
 if (!defined('ADODB_DIR')) die();
diff --git a/drivers/adodb-odbc_mssql.inc.php b/drivers/adodb-odbc_mssql.inc.php
index 66bfab28..37185aac 100644
--- a/drivers/adodb-odbc_mssql.inc.php
+++ b/drivers/adodb-odbc_mssql.inc.php
@@ -1,18 +1,23 @@
 <?php
-/*
-@version   v5.21.1-dev  Unreleased
-@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
-@copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence.
-Set tabs to 4 for best viewing.
-
-  Latest version is available at https://adodb.org/
-
-  MSSQL support via ODBC. Requires ODBC. Works on Windows and Unix.
-  For Unix configuration, see http://phpbuilder.com/columns/alberto20000919.php3
-*/
+/**
+ * MSSQL driver via ODBC
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 
 // security - hide paths
 if (!defined('ADODB_DIR')) die();
diff --git a/drivers/adodb-odbc_mssql2012.inc.php b/drivers/adodb-odbc_mssql2012.inc.php
index 4832cab1..9ecaecfa 100644
--- a/drivers/adodb-odbc_mssql2012.inc.php
+++ b/drivers/adodb-odbc_mssql2012.inc.php
@@ -1,4 +1,23 @@
 <?php
+/**
+ * Microsoft SQL Server 2012 driver via ODBC
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 /*
  @version   v5.21.1-dev  Unreleased
  @copyright (c) 2015      Damien Regad, Mark Newnham and the ADOdb community
diff --git a/drivers/adodb-odbc_oracle.inc.php b/drivers/adodb-odbc_oracle.inc.php
index f7329ea6..d8461e1a 100644
--- a/drivers/adodb-odbc_oracle.inc.php
+++ b/drivers/adodb-odbc_oracle.inc.php
@@ -1,17 +1,24 @@
 <?php
-/*
-@version   v5.21.1-dev  Unreleased
-@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
-@copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence.
-Set tabs to 4 for best viewing.
+/**
+ * Oracle driver via ODBC
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 
-  Latest version is available at https://adodb.org/
-
-  Oracle support via ODBC. Requires ODBC. Works on Windows.
-*/
 // security - hide paths
 if (!defined('ADODB_DIR')) die();
 
diff --git a/drivers/adodb-odbtp.inc.php b/drivers/adodb-odbtp.inc.php
index 3e82b646..bd167a1c 100644
--- a/drivers/adodb-odbtp.inc.php
+++ b/drivers/adodb-odbtp.inc.php
@@ -1,15 +1,26 @@
 <?php
-/*
-  @version   v5.21.1-dev  Unreleased
-  @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
-  @copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence. See License.txt.
-  Set tabs to 4 for best viewing.
-  Latest version is available at https://adodb.org/
-*/
-// Code contributed by "stefan bogdan" <sbogdan#rsb.ro>
+/**
+ * ODBTP driver
+ *
+ * @deprecated will be removed in ADOdb version 6
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ * @author stefan bogdan <sbogdan@rsb.ro>
+ */
 
 // security - hide paths
 if (!defined('ADODB_DIR')) die();
diff --git a/drivers/adodb-odbtp_unicode.inc.php b/drivers/adodb-odbtp_unicode.inc.php
index dd4c20db..190c3ab5 100644
--- a/drivers/adodb-odbtp_unicode.inc.php
+++ b/drivers/adodb-odbtp_unicode.inc.php
@@ -1,30 +1,36 @@
 <?php
-/*
-	@version   v5.21.1-dev  Unreleased
-	@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
-	@copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence. See License.txt.
-  Set tabs to 4 for best viewing.
-  Latest version is available at https://adodb.org/
-*/
-
-// Code contributed by "Robert Twitty" <rtwitty#neutron.ushmm.org>
+/**
+ * ODBTP Unicode driver.
+ *
+ * @deprecated will be removed in ADOdb version 6
+ *
+ * Because the ODBTP server sends and reads UNICODE text data using UTF-8
+ * encoding, the following HTML meta tag must be included within the HTML
+ * head section of every HTML form and script page:
+ * <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+ * Also, all SQL query strings must be submitted as UTF-8 encoded text.
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ * @author Robert Twitty <rtwitty@neutron.ushmm.org>
+ */
 
 // security - hide paths
 if (!defined('ADODB_DIR')) die();
 
-/*
-    Because the ODBTP server sends and reads UNICODE text data using UTF-8
-    encoding, the following HTML meta tag must be included within the HTML
-    head section of every HTML form and script page:
-
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-
-    Also, all SQL query strings must be submitted as UTF-8 encoded text.
-*/
-
 if (!defined('_ADODB_ODBTP_LAYER')) {
 	include_once(ADODB_DIR."/drivers/adodb-odbtp.inc.php");
 }
diff --git a/drivers/adodb-oracle.inc.php b/drivers/adodb-oracle.inc.php
index 2ff1a273..1a2735b1 100644
--- a/drivers/adodb-oracle.inc.php
+++ b/drivers/adodb-oracle.inc.php
@@ -1,18 +1,25 @@
 <?php
-/*
-@version   v5.21.1-dev  Unreleased
-@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
-@copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence.
-
-  Latest version is available at https://adodb.org/
-
-  Oracle data driver. Requires Oracle client. Works on Windows and Unix and Oracle 7.
-
-  If you are using Oracle 8 or later, use the oci8 driver which is much better and more reliable.
-*/
+/**
+ * Oracle data driver
+ *
+ * @deprecated Use oci8 driver instead
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 
 // security - hide paths
 if (!defined('ADODB_DIR')) die();
diff --git a/drivers/adodb-pdo.inc.php b/drivers/adodb-pdo.inc.php
index 0262362b..7b676d3b 100644
--- a/drivers/adodb-pdo.inc.php
+++ b/drivers/adodb-pdo.inc.php
@@ -1,23 +1,23 @@
 <?php
 /**
-	@version   v5.21.1-dev  Unreleased
-	@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
-	@copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
-
-	Released under both BSD license and Lesser GPL library license.
-	Whenever there is any discrepancy between the two licenses,
-	the BSD license will take precedence.
-
-	Set tabs to 4 for best viewing.
-
-	Latest version is available at https://adodb.org/
-
-	Requires ODBC. Works on Windows and Unix.
-
-	Problems:
-		Where is float/decimal type in pdo_param_type
-		LOB handling for CLOB/BLOB differs significantly
-*/
+ * ADOdb base PDO driver
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 
 // security - hide paths
 if (!defined('ADODB_DIR')) die();
diff --git a/drivers/adodb-pdo_dblib.inc.php b/drivers/adodb-pdo_dblib.inc.php
index 05eed8b7..aae561bf 100644
--- a/drivers/adodb-pdo_dblib.inc.php
+++ b/drivers/adodb-pdo_dblib.inc.php
@@ -2,13 +2,21 @@
 /**
  * ADOdb PDO dblib driver.
  *
- * Released under both BSD license and Lesser GPL library license.
- * Whenever there is any discrepancy between the two licenses, the BSD license
- * will take precedence.
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
  *
- * @version   v5.21.1-dev  Unreleased
- * @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
- * @copyright (c) 2019      Damien Regad, Mark Newnham and the ADOdb community
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2019 Damien Regad, Mark Newnham and the ADOdb community
  */
 
 class ADODB_pdo_dblib extends ADODB_pdo
diff --git a/drivers/adodb-pdo_firebird.inc.php b/drivers/adodb-pdo_firebird.inc.php
index 73c7b46b..0ee5e02b 100644
--- a/drivers/adodb-pdo_firebird.inc.php
+++ b/drivers/adodb-pdo_firebird.inc.php
@@ -1,19 +1,24 @@
 <?php
 /**
- * ADOdb PDO Firebird driver
+ * PDO Firebird driver
  *
- * @version   v5.21.1-dev  Unreleased
- * @copyright (c) 2019      Damien Regad, Mark Newnham and the ADOdb community
+ * This version has only been tested on Firebird 3.0 and PHP 7
  *
- * Released under both BSD license and Lesser GPL library license.
- * Whenever there is any discrepancy between the two licenses,
- * the BSD license will take precedence. See License.txt.
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
  *
- * Set tabs to 4 for best viewing.
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
  *
- * Latest version is available at https://adodb.org/
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
  *
- * This version has only been tested on Firebird 3.0 and PHP 7
+ * @copyright 2000-2013 John Lim
+ * @copyright 2019 Damien Regad, Mark Newnham and the ADOdb community
  */
 
 /**
diff --git a/drivers/adodb-pdo_mssql.inc.php b/drivers/adodb-pdo_mssql.inc.php
index 82d2e765..ef63b654 100644
--- a/drivers/adodb-pdo_mssql.inc.php
+++ b/drivers/adodb-pdo_mssql.inc.php
@@ -1,16 +1,23 @@
 <?php
-
-
-/*
-@version   v5.21.1-dev  Unreleased
-@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
-@copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence.
-  Set tabs to 8.
-
-*/
+/**
+ * PDO MSSQL driver
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 
 class ADODB_pdo_mssql extends ADODB_pdo {
 
diff --git a/drivers/adodb-pdo_mysql.inc.php b/drivers/adodb-pdo_mysql.inc.php
index 851c4a6a..c8812453 100644
--- a/drivers/adodb-pdo_mysql.inc.php
+++ b/drivers/adodb-pdo_mysql.inc.php
@@ -1,14 +1,23 @@
 <?php
-/*
-@version   v5.21.1-dev  Unreleased
-@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
-@copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence.
-  Set tabs to 8.
-
-*/
+/**
+ * PDO MySQL driver
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 
 class ADODB_pdo_mysql extends ADODB_pdo {
 
diff --git a/drivers/adodb-pdo_oci.inc.php b/drivers/adodb-pdo_oci.inc.php
index 2ee8a63f..20b47def 100644
--- a/drivers/adodb-pdo_oci.inc.php
+++ b/drivers/adodb-pdo_oci.inc.php
@@ -1,16 +1,23 @@
 <?php
-
-
-/*
-@version   v5.21.1-dev  Unreleased
-@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
-@copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence.
-  Set tabs to 8.
-
-*/
+/**
+ * PDO Oracle (oci) driver
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 
 class ADODB_pdo_oci extends ADODB_pdo_base {
 
diff --git a/drivers/adodb-pdo_pgsql.inc.php b/drivers/adodb-pdo_pgsql.inc.php
index eb3a6930..6c06ac10 100644
--- a/drivers/adodb-pdo_pgsql.inc.php
+++ b/drivers/adodb-pdo_pgsql.inc.php
@@ -1,15 +1,23 @@
 <?php
-
-/*
-@version   v5.21.1-dev  Unreleased
-@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
-@copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence.
-  Set tabs to 8.
-
-*/
+/**
+ * PDO PostgreSQL (pgsql) driver
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 
 class ADODB_pdo_pgsql extends ADODB_pdo {
 	var $metaDatabasesSQL = "select datname from pg_database where datname not in ('template0','template1') order by 1";
diff --git a/drivers/adodb-pdo_sqlite.inc.php b/drivers/adodb-pdo_sqlite.inc.php
index 210eb267..dab1de99 100644
--- a/drivers/adodb-pdo_sqlite.inc.php
+++ b/drivers/adodb-pdo_sqlite.inc.php
@@ -1,19 +1,25 @@
 <?php
-
-/*
- @version   v5.21.1-dev  Unreleased
- @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
- @copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence. See License.txt.
-  Set tabs to 4 for best viewing.
-
-  Latest version is available at https://adodb.org/
-
-  Thanks Diogo Toscano (diogo#scriptcase.net) for the code.
-	And also Sid Dunayer [sdunayer#interserv.com] for extensive fixes.
-*/
+/**
+ * PDO SQLite driver
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ * @author Diogo Toscano <diogo@scriptcase.net>
+ * @author Sid Dunayer <sdunayer@interserv.com>
+ */
 
 class ADODB_pdo_sqlite extends ADODB_pdo {
 	var $metaTablesSQL   = "SELECT name FROM sqlite_master WHERE type='table'";
diff --git a/drivers/adodb-pdo_sqlsrv.inc.php b/drivers/adodb-pdo_sqlsrv.inc.php
index ba5180ec..ed73f3a2 100644
--- a/drivers/adodb-pdo_sqlsrv.inc.php
+++ b/drivers/adodb-pdo_sqlsrv.inc.php
@@ -1,8 +1,25 @@
 <?php
-
 /**
- * Provided by Ned Andre to support sqlsrv library
+ * PDO sqlsrv driver
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ * @author Ned Andre
  */
+
 class ADODB_pdo_sqlsrv extends ADODB_pdo
 {
 	var $hasTop = 'top';
diff --git a/drivers/adodb-postgres.inc.php b/drivers/adodb-postgres.inc.php
index ff36dcdd..070ac1c7 100644
--- a/drivers/adodb-postgres.inc.php
+++ b/drivers/adodb-postgres.inc.php
@@ -1,15 +1,25 @@
 <?php
-/*
- @version   v5.21.1-dev  Unreleased
- @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
- @copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence.
-  Set tabs to 4.
-
-  NOTE: Since 3.31, this file is no longer used, and the "postgres" driver is
-  remapped to lastest available postgres version. Maintaining multiple
-  postgres drivers is no easy job, so hopefully this will ensure greater
-  consistency and fewer bugs.
-*/
+/**
+ * ADOdb PostgreSQL driver
+ *
+ * NOTE: Since ADOdb 3.31, this file is no longer used, and the "postgres"
+ * driver is remapped to the latest available postgres version. Maintaining
+ * multiple postgres drivers is no easy job, so hopefully this will ensure
+ * greater consistency and fewer bugs.
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
diff --git a/drivers/adodb-postgres64.inc.php b/drivers/adodb-postgres64.inc.php
index 3dd2c755..e2fb5c97 100644
--- a/drivers/adodb-postgres64.inc.php
+++ b/drivers/adodb-postgres64.inc.php
@@ -1,48 +1,23 @@
 <?php
-/*
- @version   v5.21.1-dev  Unreleased
- @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
- @copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence.
-  Set tabs to 8.
-
-  Original version derived from Alberto Cerezal (acerezalp@dbnet.es) - DBNet Informatica & Comunicaciones.
-  08 Nov 2000 jlim - Minor corrections, removing mysql stuff
-  09 Nov 2000 jlim - added insertid support suggested by "Christopher Kings-Lynne" <chriskl@familyhealth.com.au>
-			  jlim - changed concat operator to || and data types to MetaType to match documented pgsql types
-					 see http://www.postgresql.org/devel-corner/docs/postgres/datatype.htm
-  22 Nov 2000 jlim - added changes to FetchField() and MetaTables() contributed by "raser" <raser@mail.zen.com.tw>
-  27 Nov 2000 jlim - added changes to _connect/_pconnect from ideas by "Lennie" <leen@wirehub.nl>
-  15 Dec 2000 jlim - added changes suggested by Additional code changes by "Eric G. Werk" egw@netguide.dk.
-  31 Jan 2002 jlim - finally installed postgresql. testing
-  01 Mar 2001 jlim - Freek Dijkstra changes, also support for text type
-
-  See http://www.varlena.com/varlena/GeneralBits/47.php
-
-	-- What indexes are on my table?
-	select * from pg_indexes where tablename = 'tablename';
-
-	-- What triggers are on my table?
-	select c.relname as "Table", t.tgname as "Trigger Name",
-	   t.tgconstrname as "Constraint Name", t.tgenabled as "Enabled",
-	   t.tgisconstraint as "Is Constraint", cc.relname as "Referenced Table",
-	   p.proname as "Function Name"
-	from pg_trigger t, pg_class c, pg_class cc, pg_proc p
-	where t.tgfoid = p.oid and t.tgrelid = c.oid
-	   and t.tgconstrrelid = cc.oid
-	   and c.relname = 'tablename';
-
-	-- What constraints are on my table?
-	select r.relname as "Table", c.conname as "Constraint Name",
-	   contype as "Constraint Type", conkey as "Key Columns",
-	   confkey as "Foreign Columns", consrc as "Source"
-	from pg_class r, pg_constraint c
-	where r.oid = c.conrelid
-	   and relname = 'tablename';
-
-*/
+/**
+ * ADOdb PostgreSQL 6.4 driver
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 
 // security - hide paths
 if (!defined('ADODB_DIR')) die();
diff --git a/drivers/adodb-postgres7.inc.php b/drivers/adodb-postgres7.inc.php
index d49fe243..59174f67 100644
--- a/drivers/adodb-postgres7.inc.php
+++ b/drivers/adodb-postgres7.inc.php
@@ -1,17 +1,23 @@
 <?php
-/*
- @version   v5.21.1-dev  Unreleased
- @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
- @copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence.
-  Set tabs to 4.
-
-  Postgres7 support.
-  28 Feb 2001: Currently indicate that we support LIMIT
-  01 Dec 2001: dannym added support for default values
-*/
+/**
+ * ADOdb PostgreSQL 7 driver
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 
 // security - hide paths
 if (!defined('ADODB_DIR')) die();
diff --git a/drivers/adodb-postgres8.inc.php b/drivers/adodb-postgres8.inc.php
index 11ec9e7a..37c2aae1 100644
--- a/drivers/adodb-postgres8.inc.php
+++ b/drivers/adodb-postgres8.inc.php
@@ -1,15 +1,23 @@
 <?php
-/*
- @version   v5.21.1-dev  Unreleased
- @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
- @copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence.
-  Set tabs to 4.
-
-  Postgres8 support.
-*/
+/**
+ * ADOdb PostgreSQL 8 driver
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 
 // security - hide paths
 if (!defined('ADODB_DIR')) die();
diff --git a/drivers/adodb-postgres9.inc.php b/drivers/adodb-postgres9.inc.php
index 9fd7adb0..fb9c6785 100644
--- a/drivers/adodb-postgres9.inc.php
+++ b/drivers/adodb-postgres9.inc.php
@@ -1,15 +1,23 @@
 <?php
-/*
- @version   v5.21.1-dev  Unreleased
- @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
- @copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence.
-  Set tabs to 4.
-
-  Postgres9 support.
-*/
+/**
+ * ADOdb PostgreSQL 9+ driver
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 
 // security - hide paths
 if (!defined('ADODB_DIR')) die();
diff --git a/drivers/adodb-proxy.inc.php b/drivers/adodb-proxy.inc.php
index 19d6268e..3be13179 100644
--- a/drivers/adodb-proxy.inc.php
+++ b/drivers/adodb-proxy.inc.php
@@ -1,15 +1,25 @@
 <?php
-/*
-@version   v5.21.1-dev  Unreleased
-@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
-@copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence.
-  Set tabs to 4.
-
-  Synonym for csv driver.
-*/
+/**
+ * ADOdb Proxy Server driver
+ *
+ * @deprecated
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 
 // security - hide paths
 if (!defined('ADODB_DIR')) die();
diff --git a/drivers/adodb-sapdb.inc.php b/drivers/adodb-sapdb.inc.php
index 5e2f5578..34eb4a55 100644
--- a/drivers/adodb-sapdb.inc.php
+++ b/drivers/adodb-sapdb.inc.php
@@ -1,18 +1,23 @@
 <?php
-/*
-@version   v5.21.1-dev  Unreleased
-@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
-@copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence.
-Set tabs to 4 for best viewing.
-
-  Latest version is available at https://adodb.org/
-
-  SAPDB data driver. Requires ODBC.
-
-*/
+/**
+ * SAPDB data driver
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 
 // security - hide paths
 if (!defined('ADODB_DIR')) die();
diff --git a/drivers/adodb-sqlanywhere.inc.php b/drivers/adodb-sqlanywhere.inc.php
index 12be35d0..88897af9 100644
--- a/drivers/adodb-sqlanywhere.inc.php
+++ b/drivers/adodb-sqlanywhere.inc.php
@@ -1,47 +1,23 @@
 <?php
-/*
-@version   v5.21.1-dev  Unreleased
-@copyright (c) 2000-2013  John Lim (jlim#natsoft.com).  All rights
-@copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
-reserved.
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence.
-Set tabs to 4 for best viewing.
-
-  Latest version is available at https://adodb.org/
-
-  21.02.2002 - Wade Johnson wade@wadejohnson.de
-			   Extended ODBC class for Sybase SQLAnywhere.
-   1) Added support to retrieve the last row insert ID on tables with
-	  primary key column using autoincrement function.
-
-   2) Added blob support.  Usage:
-		 a) create blob variable on db server:
-
-		$dbconn->create_blobvar($blobVarName);
-
-	  b) load blob var from file.  $filename must be complete path
-
-	  $dbcon->load_blobvar_from_file($blobVarName, $filename);
-
-	  c) Use the $blobVarName in SQL insert or update statement in the values
-	  clause:
-
-		$recordSet = $dbconn->Execute('INSERT INTO tabname (idcol, blobcol) '
-		.
-	   'VALUES (\'test\', ' . $blobVarName . ')');
-
-	 instead of loading blob from a file, you can also load from
-	  an unformatted (raw) blob variable:
-	  $dbcon->load_blobvar_from_var($blobVarName, $varName);
-
-	  d) drop blob variable on db server to free up resources:
-	  $dbconn->drop_blobvar($blobVarName);
-
-  Sybase_SQLAnywhere data driver. Requires ODBC.
-
-*/
+/**
+ * SAP SQL Anywhere driver (previously Sybase SQL Anywhere)
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 
 // security - hide paths
 if (!defined('ADODB_DIR')) die();
diff --git a/drivers/adodb-sqlite.inc.php b/drivers/adodb-sqlite.inc.php
index 00a9aa2e..875acef7 100644
--- a/drivers/adodb-sqlite.inc.php
+++ b/drivers/adodb-sqlite.inc.php
@@ -1,4 +1,23 @@
 <?php
+/**
+ * FileDescription
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 /*
 @version   v5.21.1-dev  Unreleased
 @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
diff --git a/drivers/adodb-sqlite3.inc.php b/drivers/adodb-sqlite3.inc.php
index 382b1a81..7f945620 100644
--- a/drivers/adodb-sqlite3.inc.php
+++ b/drivers/adodb-sqlite3.inc.php
@@ -1,21 +1,25 @@
 <?php
-/*
-@version   v5.21.1-dev  Unreleased
-@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
-@copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence.
-
-  Latest version is available at https://adodb.org/
-
-  SQLite info: http://www.hwaci.com/sw/sqlite/
-
-  Install Instructions:
-  ====================
-  1. Place this in adodb/drivers
-  2. Rename the file, remove the .txt prefix.
-*/
+/**
+ * SQLite3 driver
+ *
+ * @link https://www.sqlite.org/
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 
 // security - hide paths
 if (!defined('ADODB_DIR')) die();
diff --git a/drivers/adodb-sqlitepo.inc.php b/drivers/adodb-sqlitepo.inc.php
index e7818eb2..cb69ff9e 100644
--- a/drivers/adodb-sqlitepo.inc.php
+++ b/drivers/adodb-sqlitepo.inc.php
@@ -1,23 +1,31 @@
 <?php
-/*
-@version   v5.21.1-dev  Unreleased
-@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
-@copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence.
-
-  Portable version of sqlite driver, to make it more similar to other database drivers.
-  The main differences are
-
-   1. When selecting (joining) multiple tables, in assoc mode the table
-   	  names are included in the assoc keys in the "sqlite" driver.
-
-	  In "sqlitepo" driver, the table names are stripped from the returned column names.
-	  When this results in a conflict,  the first field get preference.
-
-	Contributed by Herman Kuiper  herman#ozuzo.net
-*/
+/**
+ * SQLite Portable driver.
+ *
+ * Make it more similar to other database drivers. The main differences are
+ * - When selecting (joining) multiple tables, in assoc mode the table
+ *   names are included in the assoc keys in the "sqlite" driver.
+ *   In "sqlitepo" driver, the table names are stripped from the returned
+ *   column names. When this results in a conflict,  the first field gets
+ *   preference.
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ * @author Herman Kuiper <herman@ozuzo.net>
+ */
 
 if (!defined('ADODB_DIR')) die();
 
diff --git a/drivers/adodb-sybase.inc.php b/drivers/adodb-sybase.inc.php
index ee96c0d1..b8db0747 100644
--- a/drivers/adodb-sybase.inc.php
+++ b/drivers/adodb-sybase.inc.php
@@ -1,21 +1,24 @@
 <?php
-/*
-@version   v5.21.1-dev  Unreleased
-@copyright (c) 2000-2013 John Lim. All rights reserved.
-@copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence.
-  Set tabs to 4 for best viewing.
-
-  Latest version is available at https://adodb.org/
-
-  Sybase driver contributed by Toni (toni.tunkkari@finebyte.com)
-
-  - MSSQL date patch applied.
-
-  Date patch by Toni 15 Feb 2002
-*/
+/**
+ * Sybase driver
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ * @author Toni Tunkkari <toni.tunkkari@finebyte.com>
+ */
 
  // security - hide paths
 if (!defined('ADODB_DIR')) die();
diff --git a/drivers/adodb-sybase_ase.inc.php b/drivers/adodb-sybase_ase.inc.php
index 505bd186..d301ba99 100644
--- a/drivers/adodb-sybase_ase.inc.php
+++ b/drivers/adodb-sybase_ase.inc.php
@@ -1,17 +1,24 @@
 <?php
-/*
-  @version   v5.21.1-dev  Unreleased
-  @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
-  @copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence.
-
-  Set tabs to 4.
-
-  Contributed by Interakt Online. Thx Cristian MARIN cristic#interaktonline.com
-*/
-
+/**
+ * SAP Adaptive Server Enterprise driver (formerly Sybase ASE)
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ * @author Cristian Marin, Interakt Online <cristic@interaktonline.com>
+ */
 
 require_once ADODB_DIR."/drivers/adodb-sybase.inc.php";
 
diff --git a/drivers/adodb-text.inc.php b/drivers/adodb-text.inc.php
index ea5c16cd..77ad06a0 100644
--- a/drivers/adodb-text.inc.php
+++ b/drivers/adodb-text.inc.php
@@ -1,63 +1,25 @@
 <?php
-/*
-@version   v5.21.1-dev  Unreleased
-@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
-@copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
-   Set tabs to 4.
-*/
-
-/*
-Setup:
-
- 	$db = NewADOConnection('text');
- 	$db->Connect($array,[$types],[$colnames]);
-
-	Parameter $array is the 2 dimensional array of data. The first row can contain the
-	column names. If column names is not defined in first row, you MUST define $colnames,
-	the 3rd parameter.
-
-	Parameter $types is optional. If defined, it should contain an array matching
-	the number of columns in $array, with each element matching the correct type defined
-	by MetaType: (B,C,I,L,N). If undefined, we will probe for $this->_proberows rows
-	to guess the type. Only C,I and N are recognised.
-
-	Parameter $colnames is optional. If defined, it is an array that contains the
-	column names of $array. If undefined, we assume the first row of $array holds the
-	column names.
-
- The Execute() function will return a recordset. The recordset works like a normal recordset.
- We have partial support for SQL parsing. We process the SQL using the following rules:
-
- 1. SQL order by's always work for the first column ordered. Subsequent cols are ignored
-
- 2. All operations take place on the same table. No joins possible. In fact the FROM clause
-	is ignored! You can use any name for the table.
-
- 3. To simplify code, all columns are returned, except when selecting 1 column
-
- 	$rs = $db->Execute('select col1,col2 from table'); // sql ignored, will generate all cols
-
-	We special case handling of 1 column because it is used in filter popups
-
-	$rs = $db->Execute('select col1 from table');
-	// sql accepted and processed -- any table name is accepted
-
-	$rs = $db->Execute('select distinct col1 from table');
-	// sql accepted and processed
-
-4. Where clauses are ignored, but searching with the 3rd parameter of Execute is permitted.
-   This has to use PHP syntax and we will eval() it. You can even use PHP functions.
-
-	 $rs = $db->Execute('select * from table',false,"\$COL1='abc' and $\COL2=3")
- 	// the 3rd param is searched -- make sure that $COL1 is a legal column name
-	// and all column names must be in upper case.
-
-4. Group by, having, other clauses are ignored
-
-5. Expression columns, min(), max() are ignored
-
-6. All data is readonly. Only SELECTs permitted.
-*/
+/**
+ * ADOdb Plain Text driver
+ *
+ * @deprecated
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 
 // security - hide paths
 if (!defined('ADODB_DIR')) die();
diff --git a/drivers/adodb-vfp.inc.php b/drivers/adodb-vfp.inc.php
index 7b670331..bb435168 100644
--- a/drivers/adodb-vfp.inc.php
+++ b/drivers/adodb-vfp.inc.php
@@ -1,17 +1,25 @@
 <?php
-/*
-@version   v5.21.1-dev  Unreleased
-@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
-@copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence.
-Set tabs to 4 for best viewing.
-
-  Latest version is available at https://adodb.org/
-
-  Microsoft Visual FoxPro data driver. Requires ODBC. Works only on MS Windows.
-*/
+/**
+ * Microsoft Visual FoxPro driver
+ *
+ * @deprecated
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 
 // security - hide paths
 if (!defined('ADODB_DIR')) die();
diff --git a/lang/adodb-ar.inc.php b/lang/adodb-ar.inc.php
index 0b8f12ff..920c9943 100644
--- a/lang/adodb-ar.inc.php
+++ b/lang/adodb-ar.inc.php
@@ -1,5 +1,25 @@
 <?php
-// by "El-Shamaa, Khaled" <k.el-shamaa#cgiar.org>
+/**
+ * Arabic language strings.
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ * @author El-Shamaa, Khaled <k.el-shamaa@cgiar.org>
+ */
+
 $ADODB_LANG_ARRAY = array (
 			'LANG'			    => 'ar',
 	    DB_ERROR			=> 'خطأ غير محدد',
diff --git a/lang/adodb-bg.inc.php b/lang/adodb-bg.inc.php
index 07069b42..bbfd92f2 100644
--- a/lang/adodb-bg.inc.php
+++ b/lang/adodb-bg.inc.php
@@ -1,8 +1,24 @@
 <?php
-/*
-	Bulgarian language, v1.0, 25.03.2004, encoding by UTF-8 charset
-	contributed by Valentin Sheiretsky <valio#valio.eu.org>
-*/
+/**
+ * Bulgarian language strings.
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ * @author Valentin Sheiretsky <valio@valio.eu.org>
+ */
 
 $ADODB_LANG_ARRAY = array (
             'LANG'                      => 'bg',
diff --git a/lang/adodb-ca.inc.php b/lang/adodb-ca.inc.php
index adbafac9..4b046884 100644
--- a/lang/adodb-ca.inc.php
+++ b/lang/adodb-ca.inc.php
@@ -1,6 +1,25 @@
 <?php
-// Catalan language
-// contributed by "Josep Lladonosa" jlladono#pie.xtec.es
+/**
+ * Catalan language strings.
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ * @author Josep Lladonosa <jlladono@pie.xtec.es>
+ */
+
 $ADODB_LANG_ARRAY = array (
 			'LANG'                      => 'ca',
             DB_ERROR                    => 'error desconegut',
diff --git a/lang/adodb-cn.inc.php b/lang/adodb-cn.inc.php
index 9c973413..512ffb82 100644
--- a/lang/adodb-cn.inc.php
+++ b/lang/adodb-cn.inc.php
@@ -1,6 +1,25 @@
 <?php
-// Chinese language file contributed by "Cuiyan (cysoft)" cysoft#php.net.
-// Simplified Chinese
+/**
+ * Simplified Chinese language strings.
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ * @author Cuiyan (cysoft) <cysoft@php.net>
+ */
+
 $ADODB_LANG_ARRAY = array (
 			'LANG'                      => 'cn',
             DB_ERROR                    => '未知错误',
diff --git a/lang/adodb-cz.inc.php b/lang/adodb-cz.inc.php
index d79d7142..eb2fb2e3 100644
--- a/lang/adodb-cz.inc.php
+++ b/lang/adodb-cz.inc.php
@@ -1,7 +1,24 @@
 <?php
-
-# Czech language
-# v1.0, 19.06.2003 Kamil Jakubovic <jake@host.sk>
+/**
+ * Czech language strings.
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ * @author Kamil Jakubovic <jake@host.sk>
+ */
 
 $ADODB_LANG_ARRAY = array (
             'LANG'                      => 'cz',
diff --git a/lang/adodb-da.inc.php b/lang/adodb-da.inc.php
index 14e720b8..e4c655be 100644
--- a/lang/adodb-da.inc.php
+++ b/lang/adodb-da.inc.php
@@ -1,5 +1,25 @@
 <?php
-// Arne Eckmann bananstat#users.sourceforge.net
+/**
+ * Danish language strings.
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ * @author Arne Eckmann <bananstat@users.sourceforge.net>
+ */
+
 $ADODB_LANG_ARRAY = array (
   	    'LANG'                      => 'da',
             DB_ERROR                    => 'ukendt fejl',
diff --git a/lang/adodb-de.inc.php b/lang/adodb-de.inc.php
index 99dde149..a02dd729 100644
--- a/lang/adodb-de.inc.php
+++ b/lang/adodb-de.inc.php
@@ -1,5 +1,25 @@
 <?php
-// contributed by "Heinz Hombergs" <opn@hhombergs.de>
+/**
+ * German language strings.
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ * @author Heinz Hombergs <opn@hhombergs.de>
+ */
+
 $ADODB_LANG_ARRAY = array (
 	'LANG'                      => 'de',
 	DB_ERROR                    => 'unbekannter Fehler',
diff --git a/lang/adodb-en.inc.php b/lang/adodb-en.inc.php
index 05828554..74c4ea02 100644
--- a/lang/adodb-en.inc.php
+++ b/lang/adodb-en.inc.php
@@ -1,4 +1,23 @@
 <?php
+/**
+ * English language strings.
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 
 $ADODB_LANG_ARRAY = array (
 			'LANG'                      => 'en',
diff --git a/lang/adodb-eo.inc.php b/lang/adodb-eo.inc.php
index baa589c1..107a3b37 100644
--- a/lang/adodb-eo.inc.php
+++ b/lang/adodb-eo.inc.php
@@ -1,6 +1,24 @@
 <?php
-// Vivu Esperanto ĉiam!
-// Traduko fare de Antono Vasiljev (anders[#]brainactive.org)
+/**
+ * Esperanto language strings.
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ * @author Antono Vasiljev <anders@brainactive.org>
+ */
 
 $ADODB_LANG_ARRAY = array (
              'LANG'                      => 'eo',
diff --git a/lang/adodb-es.inc.php b/lang/adodb-es.inc.php
index a80a6441..bcb0ccea 100644
--- a/lang/adodb-es.inc.php
+++ b/lang/adodb-es.inc.php
@@ -1,5 +1,25 @@
 <?php
-// contributed by "Horacio Degiorgi" <horaciod@codigophp.com>
+/**
+ * Spanish language strings.
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ * @author Horacio Degiorgi <horaciod@codigophp.com>
+ */
+
 $ADODB_LANG_ARRAY = array (
 			'LANG'                      => 'es',
             DB_ERROR                    => 'error desconocido',
diff --git a/lang/adodb-fa.inc.php b/lang/adodb-fa.inc.php
index 7fa46183..84f17bd8 100644
--- a/lang/adodb-fa.inc.php
+++ b/lang/adodb-fa.inc.php
@@ -1,6 +1,24 @@
 <?php
-
-/* Farsi - by "Peyman Hooshmandi Raad" <phooshmand#gmail.com> */
+/**
+ * Farsi language strings.
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ * @author Peyman Hooshmandi Raad" <phooshmand@gmail.com>
+ */
 
 $ADODB_LANG_ARRAY = array (
 			'LANG'                      => 'fa',
diff --git a/lang/adodb-fr.inc.php b/lang/adodb-fr.inc.php
index 620196b4..b010d1e5 100644
--- a/lang/adodb-fr.inc.php
+++ b/lang/adodb-fr.inc.php
@@ -1,4 +1,23 @@
 <?php
+/**
+ * French language strings.
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 
 $ADODB_LANG_ARRAY = array (
 	'LANG'                      => 'fr',
diff --git a/lang/adodb-hu.inc.php b/lang/adodb-hu.inc.php
index 49357ce2..5a73827b 100644
--- a/lang/adodb-hu.inc.php
+++ b/lang/adodb-hu.inc.php
@@ -1,6 +1,25 @@
 <?php
-# Hungarian language, encoding by ISO 8859-2 charset (Iso Latin-2)
-# Halászvári Gábor <g.halaszvari#portmax.hu>
+/**
+ * Hungarian language strings.
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ * @author Halászvári Gábor <g.halaszvari@portmax.hu>
+ */
+
 $ADODB_LANG_ARRAY = array (
 			'LANG'                      => 'hu',
             DB_ERROR                    => 'ismeretlen hiba',
diff --git a/lang/adodb-id.inc.php b/lang/adodb-id.inc.php
index f5344c63..abd38eee 100644
--- a/lang/adodb-id.inc.php
+++ b/lang/adodb-id.inc.php
@@ -1,6 +1,25 @@
 <?php
-# Indonesian language
-# Bambang Riswanto <bamz3r@gmail.com>
+/**
+ * Indonesian language strings.
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ * @author Bambang Riswanto <bamz3r@gmail.com>
+ */
+
 $ADODB_LANG_ARRAY = array (
 			'LANG'                      => 'id',
             DB_ERROR                    => 'kesalahan tidak diketahui',
diff --git a/lang/adodb-it.inc.php b/lang/adodb-it.inc.php
index 80524e1d..a6516308 100644
--- a/lang/adodb-it.inc.php
+++ b/lang/adodb-it.inc.php
@@ -1,6 +1,25 @@
 <?php
-// Italian language file contributed by Tiraboschi Massimiliano aka TiMax
-// www.maxdev.com  timax@maxdev.com
+/**
+ * Italian language strings.
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ * @author Tiraboschi Massimiliano <timax@maxdev.com>
+ */
+
 $ADODB_LANG_ARRAY = array (
             'LANG'                      => 'it',
             DB_ERROR                    => 'errore sconosciuto',
diff --git a/lang/adodb-nl.inc.php b/lang/adodb-nl.inc.php
index 43e3ee69..8a898193 100644
--- a/lang/adodb-nl.inc.php
+++ b/lang/adodb-nl.inc.php
@@ -1,5 +1,25 @@
 <?php
-// Translated by Pim Koeman (pim#wittenborg-university.com)
+/**
+ * Dutch language strings.
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ * @author Pim Koeman <pim@wittenborg-university.com>
+ */
+
 $ADODB_LANG_ARRAY = array (
 			'LANG'                      => 'nl',
             DB_ERROR                    => 'onbekende fout',
diff --git a/lang/adodb-oc.inc.php b/lang/adodb-oc.inc.php
index d62b67b3..3481e79a 100644
--- a/lang/adodb-oc.inc.php
+++ b/lang/adodb-oc.inc.php
@@ -1,4 +1,24 @@
 <?php
+/**
+ * Occitan language strings.
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
+
 $ADODB_LANG_ARRAY = array (
 	'LANG'                      => 'oc',
 	DB_ERROR                    => 'error desconeguda',
diff --git a/lang/adodb-pl.inc.php b/lang/adodb-pl.inc.php
index ffa10e33..f855153e 100644
--- a/lang/adodb-pl.inc.php
+++ b/lang/adodb-pl.inc.php
@@ -1,6 +1,24 @@
 <?php
-
-// Contributed by Grzegorz Pacan <gp#dione.cc>
+/**
+ * Polish language strings.
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ * @author Grzegorz Pacan <gp@dione.cc>
+ */
 
 $ADODB_LANG_ARRAY = array (
 			'LANG'                      => 'pl',
diff --git a/lang/adodb-pt-br.inc.php b/lang/adodb-pt-br.inc.php
index ba67167e..b6c0d1c9 100644
--- a/lang/adodb-pt-br.inc.php
+++ b/lang/adodb-pt-br.inc.php
@@ -1,6 +1,25 @@
 <?php
-// contributed by "Levi Fukumori" levi _AT_ fukumori _DOT_ com _DOT_ br
-// portuguese (brazilian)
+/**
+ * Portuguese (Brazilian) language strings.
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ * @author Levi Fukumori <levi@fukumori.com.br>
+ */
+
 $ADODB_LANG_ARRAY = array (
 			'LANG'                      => 'pt-br',
             DB_ERROR                    => 'erro desconhecido',
diff --git a/lang/adodb-ro.inc.php b/lang/adodb-ro.inc.php
index b6ddd313..011c0163 100644
--- a/lang/adodb-ro.inc.php
+++ b/lang/adodb-ro.inc.php
@@ -1,6 +1,24 @@
 <?php
-
-/* Romanian - by "bogdan stefan" <sbogdan#rsb.ro> */
+/**
+ * Romanian language strings.
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ * @author Bogdan Stefan <sbogdan@rsb.ro>
+ */
 
 $ADODB_LANG_ARRAY = array (
 			'LANG'                      => 'ro',
diff --git a/lang/adodb-ru.inc.php b/lang/adodb-ru.inc.php
index 67d80f2c..a311784a 100644
--- a/lang/adodb-ru.inc.php
+++ b/lang/adodb-ru.inc.php
@@ -1,6 +1,24 @@
 <?php
-
-// Russian language file contributed by "Cyrill Malevanov" cyrill#malevanov.spb.ru.
+/**
+ * Russian language strings.
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ * @author Cyrill Malevanov <cyrill@malevanov.spb.ru>
+ */
 
 $ADODB_LANG_ARRAY = array (
              'LANG'                      => 'ru',
diff --git a/lang/adodb-sv.inc.php b/lang/adodb-sv.inc.php
index d3be6b0e..72e24301 100644
--- a/lang/adodb-sv.inc.php
+++ b/lang/adodb-sv.inc.php
@@ -1,5 +1,25 @@
 <?php
-// Christian Tiberg" christian@commsoft.nu
+/**
+ * Swedish language strings.
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ * @author Christian Tiberg <christian@commsoft.nu>
+ */
+
 $ADODB_LANG_ARRAY = array (
 			'LANG'                      => 'en',
             DB_ERROR                    => 'Okänt fel',
diff --git a/lang/adodb-th.inc.php b/lang/adodb-th.inc.php
index a0685645..354acca1 100644
--- a/lang/adodb-th.inc.php
+++ b/lang/adodb-th.inc.php
@@ -1,5 +1,25 @@
 <?php
-// by Trirat Petchsingh <rosskouk#gmail.com>
+/**
+ * Thai language strings.
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ * @author Trirat Petchsingh <rosskouk@gmail.com>
+ */
+
 $ADODB_LANG_ARRAY = array (
 			'LANG'						=> 'th',
 			DB_ERROR					=> 'error ไม่รู้สาเหตุ',
diff --git a/lang/adodb-uk.inc.php b/lang/adodb-uk.inc.php
index 2ace5bc4..e54a9670 100644
--- a/lang/adodb-uk.inc.php
+++ b/lang/adodb-uk.inc.php
@@ -1,6 +1,24 @@
 <?php
-
-// Ukrainian language file contributed by  Alex Rootoff rootoff{AT}pisem.net.
+/**
+ * Ukrainian language strings.
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ * @author Alex Rootoff <rootoff@pisem.net>
+ */
 
 $ADODB_LANG_ARRAY = array (
              'LANG'                      => 'uk',
diff --git a/pear/Auth/Container/ADOdb.php b/pear/Auth/Container/ADOdb.php
index 494e90b9..807da9d7 100644
--- a/pear/Auth/Container/ADOdb.php
+++ b/pear/Auth/Container/ADOdb.php
@@ -1,36 +1,36 @@
 <?php
-/*
-@version   v5.21.1-dev  Unreleased
-@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
-@copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence. See License.txt.
-  Set tabs to 4 for best viewing.
-
-  Latest version is available at https://adodb.org/
-
-	Original Authors: Martin Jansen <mj#php.net>
-	Richard Tango-Lowy <richtl#arscognita.com>
-*/
-
-require_once 'Auth/Container.php';
-require_once 'adodb.inc.php';
-require_once 'adodb-pear.inc.php';
-require_once 'adodb-errorpear.inc.php';
-
 /**
  * Storage driver for fetching login data from a database using ADOdb-PHP.
  *
- * This storage driver can use all databases which are supported
- * by the ADBdb DB abstraction layer to fetch login data.
- * See https://adodb.org/ for information on ADOdb.
+ * This storage driver can use all databases which are supported by the ADBdb
+ * abstraction layer to fetch login data.
  * NOTE: The ADOdb directory MUST be in your PHP include_path!
  *
- * @author   Richard Tango-Lowy <richtl@arscognita.com>
- * @package  Auth
- * @version  $Revision: 1.3 $
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ * @author Martin Jansen <mj@php.net>
+ * @author Richard Tango-Lowy <richtl@arscognita.com>
  */
+
+require_once 'Auth/Container.php';
+require_once 'adodb.inc.php';
+require_once 'adodb-pear.inc.php';
+require_once 'adodb-errorpear.inc.php';
+
+
 class Auth_Container_ADOdb extends Auth_Container
 {
 
diff --git a/pear/auth_adodb_example.php b/pear/auth_adodb_example.php
index 3b7cf5e8..77af9395 100644
--- a/pear/auth_adodb_example.php
+++ b/pear/auth_adodb_example.php
@@ -1,5 +1,26 @@
 <?php
-// NOTE: The ADOdb and PEAR directories MUST be in your PHP include_path!
+/**
+ * PEAR Auth example
+ *
+ * NOTE: The ADOdb and PEAR directories MUST be in your PHP include_path!
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
+//
 require_once "Auth/Auth.php";
 
 function loginFunction() {
diff --git a/perf/perf-db2.inc.php b/perf/perf-db2.inc.php
index f45c32a9..fc05219d 100644
--- a/perf/perf-db2.inc.php
+++ b/perf/perf-db2.inc.php
@@ -1,18 +1,23 @@
 <?php
-/*
-@version   v5.21.1-dev  Unreleased
-@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
-@copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence. See License.txt.
-  Set tabs to 4 for best viewing.
-
-  Latest version is available at https://adodb.org/
-
-  Library for basic performance monitoring and tuning
-
-*/
+/**
+ * Library for basic performance monitoring and tuning
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 
 // security - hide paths
 if (!defined('ADODB_DIR')) die();
diff --git a/perf/perf-informix.inc.php b/perf/perf-informix.inc.php
index 3ae5361b..88802bcc 100644
--- a/perf/perf-informix.inc.php
+++ b/perf/perf-informix.inc.php
@@ -1,18 +1,23 @@
 <?php
-/*
-@version   v5.21.1-dev  Unreleased
-@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
-@copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence. See License.txt.
-  Set tabs to 4 for best viewing.
-
-  Latest version is available at https://adodb.org/
-
-  Library for basic performance monitoring and tuning
-
-*/
+/**
+ * Library for basic performance monitoring and tuning
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 
 // security - hide paths
 if (!defined('ADODB_DIR')) die();
diff --git a/perf/perf-mssql.inc.php b/perf/perf-mssql.inc.php
index 17308792..5d832032 100644
--- a/perf/perf-mssql.inc.php
+++ b/perf/perf-mssql.inc.php
@@ -1,19 +1,23 @@
 <?php
-
-/*
-@version   v5.21.1-dev  Unreleased
-@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
-@copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence. See License.txt.
-  Set tabs to 4 for best viewing.
-
-  Latest version is available at https://adodb.org/
-
-  Library for basic performance monitoring and tuning
-
-*/
+/**
+ * Library for basic performance monitoring and tuning
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 
 // security - hide paths
 if (!defined('ADODB_DIR')) die();
diff --git a/perf/perf-mssqlnative.inc.php b/perf/perf-mssqlnative.inc.php
index 2435d1cf..c2c90fc7 100644
--- a/perf/perf-mssqlnative.inc.php
+++ b/perf/perf-mssqlnative.inc.php
@@ -1,19 +1,23 @@
 <?php
-
-/*
-@version   v5.21.1-dev  Unreleased
-@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
-@copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence. See License.txt.
-  Set tabs to 4 for best viewing.
-
-  Latest version is available at https://adodb.org/
-
-  Library for basic performance monitoring and tuning
-
-*/
+/**
+ * Library for basic performance monitoring and tuning
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 
 // security - hide paths
 if (!defined('ADODB_DIR')) die();
diff --git a/perf/perf-mysql.inc.php b/perf/perf-mysql.inc.php
index 204f9739..dae44229 100644
--- a/perf/perf-mysql.inc.php
+++ b/perf/perf-mysql.inc.php
@@ -1,18 +1,23 @@
 <?php
-/*
-@version   v5.21.1-dev  Unreleased
-@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
-@copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence. See License.txt.
-  Set tabs to 4 for best viewing.
-
-  Latest version is available at https://adodb.org/
-
-  Library for basic performance monitoring and tuning
-
-*/
+/**
+ * Library for basic performance monitoring and tuning
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 
 // security - hide paths
 if (!defined('ADODB_DIR')) die();
diff --git a/perf/perf-oci8.inc.php b/perf/perf-oci8.inc.php
index b379d714..c11b261f 100644
--- a/perf/perf-oci8.inc.php
+++ b/perf/perf-oci8.inc.php
@@ -1,18 +1,23 @@
 <?php
-/*
-@version   v5.21.1-dev  Unreleased
-@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
-@copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence. See License.txt.
-  Set tabs to 4 for best viewing.
-
-  Latest version is available at https://adodb.org/
-
-  Library for basic performance monitoring and tuning
-
-*/
+/**
+ * Library for basic performance monitoring and tuning
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 
 // security - hide paths
 if (!defined('ADODB_DIR')) die();
diff --git a/perf/perf-postgres.inc.php b/perf/perf-postgres.inc.php
index 86bd3a27..315c17f5 100644
--- a/perf/perf-postgres.inc.php
+++ b/perf/perf-postgres.inc.php
@@ -1,19 +1,23 @@
 <?php
-
-/*
-@version   v5.21.1-dev  Unreleased
-@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
-@copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence. See License.txt.
-  Set tabs to 4 for best viewing.
-
-  Latest version is available at https://adodb.org/
-
-  Library for basic performance monitoring and tuning
-
-*/
+/**
+ * Library for basic performance monitoring and tuning
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 
 // security - hide paths
 if (!defined('ADODB_DIR')) die();
diff --git a/phpdoc b/phpdoc
new file mode 100644
index 00000000..d4cb73a9
--- /dev/null
+++ b/phpdoc
@@ -0,0 +1,20 @@
+<?php
+/**
+ * FileDescription
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
diff --git a/pivottable.inc.php b/pivottable.inc.php
index ebb7a02d..14d8eebe 100644
--- a/pivottable.inc.php
+++ b/pivottable.inc.php
@@ -1,15 +1,23 @@
 <?php
 /**
- * @version   v5.21.1-dev  Unreleased
- * @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
- * @copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
- * Released under both BSD license and Lesser GPL library license.
- * Whenever there is any discrepancy between the two licenses,
- * the BSD license will take precedence.
+ * PivotTable.
  *
- * Set tabs to 4 for best viewing.
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
  *
-*/
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 
 /*
  * Concept from daniel.lucazeau@ajornet.com.
@@ -29,8 +37,7 @@
  *
  * @returns			Sql generated
  */
-
- function PivotTableSQL(&$db,$tables,$rowfields,$colfield, $where=false,
+function PivotTableSQL(&$db,$tables,$rowfields,$colfield, $where=false,
  	$aggfield = false,$sumlabel='Sum ',$aggfn ='SUM', $showcount = true)
  {
 	if ($aggfield) $hidecnt = true;
diff --git a/replicate/adodb-replicate.inc.php b/replicate/adodb-replicate.inc.php
index f1cdffad..f8d6c14e 100644
--- a/replicate/adodb-replicate.inc.php
+++ b/replicate/adodb-replicate.inc.php
@@ -1,60 +1,57 @@
 <?php
+/**
+ * Replication engine
+ *
+ * - Copy table structures and data from different databases
+ *   (e.g. mysql to oracle)
+ * - Generate CREATE TABLE, CREATE INDEX, INSERT for installation scripts
+ *
+ * Note: this code assumes that comments such as  / *    * / are allowed,
+ * which works with: mssql, postgresql, oracle, mssql
+ *
+ * Table Structure copying includes
+ * - fields and limited subset of types
+ * - optional default values
+ * - indexes
+ * - but not constraints
+ *
+ * Two modes of data copy:
+ * 1. ReplicateData - Copy from src to dest, with update of status of copy
+ *    back to src, with configurable src SELECT where clause
+ * 2. MergeData - Copy from src to dest based on last mod date field and/or
+ *    copied flag field
+ *
+ * Default settings are
+ * - do not execute, generate sql ($rep->execute = false)
+ * - do not delete records in dest table first ($rep->deleteFirst = false).
+ *   if $rep->deleteFirst is true and primary keys are defined,
+ *   then no deletion will occur unless *INSERTONLY* is defined in pkey array
+ * - only commit once at the end of every ReplicateData ($rep->commitReplicate = true)
+ * - do not autocommit every x records processed ($rep->commitRecs = -1)
+ * - even if error occurs on one record, continue copying remaining records ($rep->neverAbort = true)
+ * - debugging turned off ($rep->debug = false)
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 
 define('ADODB_REPLICATE',1.2);
 
 include_once(ADODB_DIR.'/adodb-datadict.inc.php');
 
-/*
-1.2		9 June 2009
-Minor patches
-
-1.1		8 June 2009
-Added $lastUpdateFld to replicatedata
-Added $rep->compat. If compat set to 1.0, then $lastUpdateFld not used during MergeData.
-
-1.0		Apr 2009
-Added support for MFFA
-
-0.9 	? 2008
-First release
-
-
-	Note: this code assumes that comments such as  / *    * / ar`e allowed which works with:
-	Note: this code assumes that comments such as  / *    * / are allowed which works with:
-		 mssql, postgresql, oracle, mssql
-
-	Replication engine to
-	 	- copy table structures and data from different databases (e.g. mysql to oracle)
-		  for replication purposes
-		- generate CREATE TABLE, CREATE INDEX, INSERT ... for installation scripts
-
-	Table Structure copying includes
-		- fields and limited subset of types
-		- optional default values
-		- indexes
-		- but not constraints
-
-
-	Two modes of data copy:
-
-	ReplicateData
-		- Copy from src to dest, with update of status of copy back to src,
-		  with configurable src SELECT where clause
-
-	MergeData
-		- Copy from src to dest based on last mod date field and/or copied flag field
-
-	Default settings are
-		- do not execute, generate sql ($rep->execute = false)
-		- do not delete records in dest table first ($rep->deleteFirst = false).
-			if $rep->deleteFirst is true and primary keys are defined,
-			then no deletion will occur unless *INSERTONLY* is defined in pkey array
-		- only commit once at the end of every ReplicateData ($rep->commitReplicate = true)
-		- do not autocommit every x records processed ($rep->commitRecs = -1)
-		- even if error occurs on one record, continue copying remaining records ($rep->neverAbort = true)
-		- debugging turned off ($rep->debug = false)
-*/
-
 class ADODB_Replicate {
 	var $connSrc;
 	var $connDest;
diff --git a/replicate/replicate-steps.php b/replicate/replicate-steps.php
index 5b696568..fca719d2 100644
--- a/replicate/replicate-steps.php
+++ b/replicate/replicate-steps.php
@@ -1,4 +1,23 @@
 <?php
+/**
+ * Replication engine
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 
 # CONFIG
 
diff --git a/replicate/test-tnb.php b/replicate/test-tnb.php
index f163ff4f..6be11072 100644
--- a/replicate/test-tnb.php
+++ b/replicate/test-tnb.php
@@ -1,4 +1,23 @@
 <?php
+/**
+ * Replication engine
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 include_once('../adodb.inc.php');
 include_once('adodb-replicate.inc.php');
 
diff --git a/rsfilter.inc.php b/rsfilter.inc.php
index 2da973e6..34c5311c 100644
--- a/rsfilter.inc.php
+++ b/rsfilter.inc.php
@@ -1,18 +1,23 @@
 <?php
 /**
- * @version   v5.21.1-dev  Unreleased
- * @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
- * @copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
- * Released under both BSD license and Lesser GPL library license.
- * Whenever there is any discrepancy between the two licenses,
- * the BSD license will take precedence.
+ * RecordSet Filter.
  *
- * Set tabs to 4 for best viewing.
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
  *
- * Latest version is available at https://adodb.org/
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
  *
- * Requires PHP4.01pl2 or later because it uses include_once
-*/
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 
 /*
 	Filter all fields and all rows in a recordset and returns the
diff --git a/scripts/buildrelease.py b/scripts/buildrelease.py
index 0cefb5f7..cba40e67 100755
--- a/scripts/buildrelease.py
+++ b/scripts/buildrelease.py
@@ -5,6 +5,22 @@ ADOdb release build script
 - Create release tag if it does not exist
 - Copy release files to target directory
 - Generate zip/tar balls
+
+This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+
+@package ADOdb
+@link https://adodb.org Project's web site and documentation
+@link https://github.com/ADOdb/ADOdb Source code and issue tracker
+
+The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+any later version. This means you can use it in proprietary products.
+See the LICENSE.md file distributed with this source code for details.
+@license BSD-3-Clause
+@license LGPL-2.1-or-later
+
+@copyright 2013 Damien Regad, Mark Newnham and the ADOdb community
+@author Damien Regad
 """
 
 import errno
diff --git a/scripts/fix-static-docs.php b/scripts/fix-static-docs.php
index 3e382b17..c4159dd5 100644
--- a/scripts/fix-static-docs.php
+++ b/scripts/fix-static-docs.php
@@ -1,12 +1,25 @@
 <?php 
 /**
-* A Program to post-process the dokuwiki document export to clean it up
-* and fix the broken links
-*
-* @link https://adodb.org/dokuwiki/doku.php?id=v6:offline_docs_build
-* @author Mark Newnham
-* @since 02/13/2015
-*/
+ * Post-processing of the DokuWiki documentation export.
+ *
+ * @link https://adodb.org/dokuwiki/doku.php?id=admin:offline_docs_build
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2015 Damien Regad, Mark Newnham and the ADOdb community
+ * @author Mark Newnham
+ */
 
 /**
 * Recurses a directory and deletes files inside
@@ -217,5 +230,3 @@ rename('documentation/adodb_index.html','documentation/index.html');
 * We could add in an auto zip and upload here, but this is a good place to
 * stop and check the output
 */
-
-?>
diff --git a/scripts/updateversion.py b/scripts/updateversion.py
index 57ee9499..5590f37f 100755
--- a/scripts/updateversion.py
+++ b/scripts/updateversion.py
@@ -3,6 +3,22 @@
 ADOdb version update script.
 
 Updates the version number, and release date in all php and html files
+
+This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+
+@package ADOdb
+@link https://adodb.org Project's web site and documentation
+@link https://github.com/ADOdb/ADOdb Source code and issue tracker
+
+The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+any later version. This means you can use it in proprietary products.
+See the LICENSE.md file distributed with this source code for details.
+@license BSD-3-Clause
+@license LGPL-2.1-or-later
+
+@copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+@author Damien Regad
 """
 
 from datetime import date
diff --git a/scripts/uploadrelease.py b/scripts/uploadrelease.py
index e93e0f51..7d801eed 100755
--- a/scripts/uploadrelease.py
+++ b/scripts/uploadrelease.py
@@ -3,6 +3,22 @@
 ADOdb release upload script.
 
 Uploads release zip/tarball files generated by buildrelease.py to SourceForge.
+
+This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+
+@package ADOdb
+@link https://adodb.org Project's web site and documentation
+@link https://github.com/ADOdb/ADOdb Source code and issue tracker
+
+The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+any later version. This means you can use it in proprietary products.
+See the LICENSE.md file distributed with this source code for details.
+@license BSD-3-Clause
+@license LGPL-2.1-or-later
+
+@copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+@author Damien Regad
 """
 
 from distutils.version import LooseVersion
diff --git a/server.php b/server.php
index 29be29f3..76e757fd 100644
--- a/server.php
+++ b/server.php
@@ -1,12 +1,28 @@
 <?php
-
 /**
- * @version   v5.21.1-dev  Unreleased
- * @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
- * @copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
- * Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence.
+ * ADOdb Proxy Server.
+ *
+ * @deprecated 5.21.0
+ *
+ * Security warning - use with extreme caution !
+ * Depending on how it is setup, this feature can potentially expose the
+ * database to attacks, particularly if used with a privileged user account.
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
  */
 
 /* Documentation on usage is at https://adodb.org/dokuwiki/doku.php?id=v5:proxy:proxy_index
diff --git a/session/adodb-compress-bzip2.php b/session/adodb-compress-bzip2.php
index 33c17c72..17ad99fb 100644
--- a/session/adodb-compress-bzip2.php
+++ b/session/adodb-compress-bzip2.php
@@ -1,24 +1,32 @@
 <?php
-
-/*
-@version   v5.21.1-dev  Unreleased
-@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
-@copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
-         Contributed by Ross Smith (adodb@netebb.com).
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence.
-	  Set tabs to 4 for best viewing.
-
-*/
+/**
+ * ADOdb Session Management
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ * @author Ross Smith <adodb@netebb.com>
+ */
 
 if (!function_exists('bzcompress')) {
 	trigger_error('bzip2 functions are not available', E_USER_ERROR);
 	return 0;
 }
 
-/*
-*/
+/**
+ */
 class ADODB_Compress_Bzip2 {
 	/**
 	 */
diff --git a/session/adodb-compress-gzip.php b/session/adodb-compress-gzip.php
index 008d250f..bbaf6c63 100644
--- a/session/adodb-compress-gzip.php
+++ b/session/adodb-compress-gzip.php
@@ -1,17 +1,23 @@
 <?php
-
-
-/*
-@version   v5.21.1-dev  Unreleased
-@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
-@copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
-         Contributed by Ross Smith (adodb@netebb.com).
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence.
-	  Set tabs to 4 for best viewing.
-
-*/
+/**
+ * ADOdb Session Management
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 
 if (!function_exists('gzcompress')) {
 	trigger_error('gzip functions are not available', E_USER_ERROR);
diff --git a/session/adodb-cryptsession.php b/session/adodb-cryptsession.php
index 36995225..08805321 100644
--- a/session/adodb-cryptsession.php
+++ b/session/adodb-cryptsession.php
@@ -1,22 +1,25 @@
 <?php
-
-
-/*
-@version   v5.21.1-dev  Unreleased
-@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
-@copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
-         Contributed by Ross Smith (adodb@netebb.com).
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence.
-	  Set tabs to 4 for best viewing.
-*/
-
-/*
-
-This file is provided for backwards compatibility purposes
-
-*/
+/**
+ * ADOdb Session Management
+ *
+ * @deprecated This file is provided for backwards compatibility purposes
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 
 if (!defined('ADODB_SESSION')) {
 	require_once dirname(__FILE__) . '/adodb-session.php';
diff --git a/session/adodb-cryptsession2.php b/session/adodb-cryptsession2.php
index 2bbfe3a9..f3e95a13 100644
--- a/session/adodb-cryptsession2.php
+++ b/session/adodb-cryptsession2.php
@@ -1,22 +1,25 @@
 <?php
-
-
-/*
-@version   v5.21.1-dev  Unreleased
-@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
-@copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
-         Contributed by Ross Smith (adodb@netebb.com).
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence.
-	  Set tabs to 4 for best viewing.
-*/
-
-/*
-
-This file is provided for backwards compatibility purposes
-
-*/
+/**
+ * ADOdb Session Management
+ *
+ * @deprecated This file is provided for backwards compatibility purposes
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 
 if (!defined('ADODB_SESSION')) {
 	require_once dirname(__FILE__) . '/adodb-session2.php';
diff --git a/session/adodb-encrypt-mcrypt.php b/session/adodb-encrypt-mcrypt.php
index bd68b8bb..bec9ff2c 100644
--- a/session/adodb-encrypt-mcrypt.php
+++ b/session/adodb-encrypt-mcrypt.php
@@ -1,17 +1,23 @@
 <?php
-
-
-/*
-@version   v5.21.1-dev  Unreleased
-@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
-@copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
-         Contributed by Ross Smith (adodb@netebb.com).
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence.
-	  Set tabs to 4 for best viewing.
-
-*/
+/**
+ * ADOdb Session Management
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 
 if (!function_exists('mcrypt_encrypt')) {
 	trigger_error('Mcrypt functions are not available', E_USER_ERROR);
diff --git a/session/adodb-encrypt-md5.php b/session/adodb-encrypt-md5.php
index 36fcc74c..7ae9b56e 100644
--- a/session/adodb-encrypt-md5.php
+++ b/session/adodb-encrypt-md5.php
@@ -1,16 +1,23 @@
 <?php
-
-/*
-@version   v5.21.1-dev  Unreleased
-@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
-@copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
-         Contributed by Ross Smith (adodb@netebb.com).
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence.
-	  Set tabs to 4 for best viewing.
-
-*/
+/**
+ * ADOdb Session Management
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 
 // security - hide paths
 if (!defined('ADODB_SESSION')) die();
diff --git a/session/adodb-encrypt-secret.php b/session/adodb-encrypt-secret.php
index 765c8c61..2c29f7a0 100644
--- a/session/adodb-encrypt-secret.php
+++ b/session/adodb-encrypt-secret.php
@@ -1,16 +1,23 @@
 <?php
-
-/*
-@version   v5.21.1-dev  Unreleased
-@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
-@copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
-         Contributed by Ross Smith (adodb@netebb.com).
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence.
-	  Set tabs to 4 for best viewing.
-
-*/
+/**
+ * ADOdb Session Management
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 
 @define('HORDE_BASE', dirname(dirname(dirname(__FILE__))) . '/horde');
 
@@ -22,14 +29,6 @@ if (!is_dir(HORDE_BASE)) {
 include_once HORDE_BASE . '/lib/Horde.php';
 include_once HORDE_BASE . '/lib/Secret.php';
 
-/**
-
-NOTE: On Windows 2000 SP4 with PHP 4.3.1, MCrypt 2.4.x, and Apache 1.3.28,
-the session didn't work properly.
-
-This may be resolved with 4.3.3.
-
- */
 class ADODB_Encrypt_Secret {
 	/**
 	 */
diff --git a/session/adodb-encrypt-sha1.php b/session/adodb-encrypt-sha1.php
index 70655153..0aa38c83 100644
--- a/session/adodb-encrypt-sha1.php
+++ b/session/adodb-encrypt-sha1.php
@@ -1,13 +1,27 @@
 <?php
+/**
+ * ADOdb Session Management
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 if (!defined('ADODB_SESSION')) die();
 
 include_once ADODB_SESSION . '/crypt.inc.php';
 
-
-/**
-
- */
-
 class ADODB_Encrypt_SHA1 {
 
 	function write($data, $key)
diff --git a/session/adodb-session-clob.php b/session/adodb-session-clob.php
index 12f9a5db..8c5e9fb3 100644
--- a/session/adodb-session-clob.php
+++ b/session/adodb-session-clob.php
@@ -1,22 +1,25 @@
 <?php
-
-
-/*
-@version   v5.21.1-dev  Unreleased
-@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
-@copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
-         Contributed by Ross Smith (adodb@netebb.com).
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence.
-	  Set tabs to 4 for best viewing.
-*/
-
-/*
-
-This file is provided for backwards compatibility purposes
-
-*/
+/**
+ * ADOdb Session Management
+ *
+ * @deprecated This file is provided for backwards compatibility purposes
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 
 if (!defined('ADODB_SESSION')) {
 	require_once dirname(__FILE__) . '/adodb-session.php';
diff --git a/session/adodb-session-clob2.php b/session/adodb-session-clob2.php
index a2c9feaf..babfa420 100644
--- a/session/adodb-session-clob2.php
+++ b/session/adodb-session-clob2.php
@@ -1,22 +1,26 @@
 <?php
-
-
-/*
-@version   v5.21.1-dev  Unreleased
-@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
-@copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
-         Contributed by Ross Smith (adodb@netebb.com).
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence.
-	  Set tabs to 4 for best viewing.
-*/
-
-/*
-
-This file is provided for backwards compatibility purposes
-
-*/
+/**
+ * ADOdb Session Management
+ *
+ * @deprecated This file is provided for backwards compatibility purposes
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ * @author Ross Smith <adodb@netebb.com>
+ */
 
 if (!defined('ADODB_SESSION')) {
 	require_once dirname(__FILE__) . '/adodb-session2.php';
diff --git a/session/adodb-session.php b/session/adodb-session.php
index bd8251be..9e716232 100644
--- a/session/adodb-session.php
+++ b/session/adodb-session.php
@@ -1,16 +1,24 @@
 <?php
-
-
-/*
-@version   v5.21.1-dev  Unreleased
-@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
-@copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
-         Contributed by Ross Smith (adodb@netebb.com).
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence.
-	  Set tabs to 4 for best viewing.
-*/
+/**
+ * ADOdb Session Management
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ * @author Ross Smith <adodb@netebb.com>
+ */
 
 /*
 	You may want to rename the 'data' field to 'session_data' as
diff --git a/session/adodb-session2.php b/session/adodb-session2.php
index 837cb2e2..bf64b416 100644
--- a/session/adodb-session2.php
+++ b/session/adodb-session2.php
@@ -1,61 +1,23 @@
 <?php
-
-
-/*
-@version   v5.21.1-dev  Unreleased
-@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
-@copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
-         Contributed by Ross Smith (adodb@netebb.com).
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence.
-	  Set tabs to 4 for best viewing.
-
-
-*/
-
-/*
-
-CREATE Table SCripts
-
-Oracle
-======
-
-CREATE TABLE SESSIONS2
-(
-  SESSKEY    VARCHAR2(48 BYTE)                  NOT NULL,
-  EXPIRY     DATE                               NOT NULL,
-  EXPIREREF  VARCHAR2(200 BYTE),
-  CREATED    DATE                               NOT NULL,
-  MODIFIED   DATE                               NOT NULL,
-  SESSDATA   CLOB,
-  PRIMARY KEY(SESSKEY)
-);
-
-
-CREATE INDEX SESS2_EXPIRY ON SESSIONS2(EXPIRY);
-CREATE UNIQUE INDEX SESS2_PK ON SESSIONS2(SESSKEY);
-CREATE INDEX SESS2_EXP_REF ON SESSIONS2(EXPIREREF);
-
-
-
- MySQL
- =====
-
-CREATE TABLE sessions2(
-	sesskey VARCHAR( 64 ) NOT NULL DEFAULT '',
-	expiry TIMESTAMP NOT NULL ,
-	expireref VARCHAR( 250 ) DEFAULT '',
-	created TIMESTAMP NOT NULL ,
-	modified TIMESTAMP NOT NULL ,
-	sessdata LONGTEXT DEFAULT '',
-	PRIMARY KEY ( sesskey ) ,
-	INDEX sess2_expiry( expiry ),
-	INDEX sess2_expireref( expireref )
-)
-
-
-*/
+/**
+ * ADOdb Session Management
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 
 if (!defined('_ADODB_LAYER')) {
 	require realpath(dirname(__FILE__) . '/../adodb.inc.php');
diff --git a/session/crypt.inc.php b/session/crypt.inc.php
index 94aa2831..82121e39 100644
--- a/session/crypt.inc.php
+++ b/session/crypt.inc.php
@@ -1,5 +1,25 @@
 <?php
-//	 Session Encryption by Ari Kuorikoski <ari.kuorikoski@finebyte.com>
+/**
+ * ADOdb Session Management
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ * @author Ari Kuorikoski <ari.kuorikoski@finebyte.com>
+ */
+
 class MD5Crypt{
 		function keyED($txt,$encrypt_key)
 		{
diff --git a/session/old/adodb-cryptsession.php b/session/old/adodb-cryptsession.php
index 70b99c49..6616de3d 100644
--- a/session/old/adodb-cryptsession.php
+++ b/session/old/adodb-cryptsession.php
@@ -1,22 +1,29 @@
 <?php
+/**
+ * ADOdb Session Management
+ *
+ * This file provides PHP4 session management using the ADODB database
+ * wrapper library.
+ *
+ * @deprecated
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 /*
-@version   v5.21.1-dev  Unreleased
-@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
-@copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence.
-	Made table name configurable - by David Johnson djohnson@inpro.net
-	Encryption by Ari Kuorikoski <ari.kuorikoski@finebyte.com>
-
-  Set tabs to 4 for best viewing.
-
-  Latest version is available at https://adodb.org/
-  ======================================================================
-
- This file provides PHP4 session management using the ADODB database
-wrapper library.
-
  Example
  =======
 
diff --git a/session/old/adodb-session-clob.php b/session/old/adodb-session-clob.php
index 03359ef3..864fdfd7 100644
--- a/session/old/adodb-session-clob.php
+++ b/session/old/adodb-session-clob.php
@@ -1,19 +1,29 @@
 <?php
+/**
+ * ADOdb Session Management
+ *
+ * This file provides PHP4 session management using the ADODB database
+ * wrapper library.
+ *
+ * @deprecated
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 /*
-  @version   v5.21.1-dev  Unreleased
-  @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
-  @copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence.
-	  Set tabs to 4 for best viewing.
-
-  Latest version is available at https://adodb.org/
-  ======================================================================
-
- This file provides PHP4 session management using the ADODB database
- wrapper library, using Oracle CLOB's to store data. Contributed by achim.gosse@ddd.de.
-
  Example
  =======
 
diff --git a/session/old/adodb-session.php b/session/old/adodb-session.php
index f90a5066..5fd43abc 100644
--- a/session/old/adodb-session.php
+++ b/session/old/adodb-session.php
@@ -1,19 +1,30 @@
 <?php
-/*
-@version   v5.21.1-dev  Unreleased
-@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
-@copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence.
-	  Set tabs to 4 for best viewing.
-
-  Latest version is available at https://adodb.org/
-  ======================================================================
-
- This file provides PHP4 session management using the ADODB database
-wrapper library.
+/**
+ * ADOdb Session Management
+ *
+ * This file provides PHP4 session management using the ADODB database
+ * wrapper library.
+ *
+ * @deprecated
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 
+/*
  Example
  =======
 
diff --git a/session/old/crypt.inc.php b/session/old/crypt.inc.php
index 1ce75feb..089e24a0 100644
--- a/session/old/crypt.inc.php
+++ b/session/old/crypt.inc.php
@@ -1,5 +1,27 @@
 <?php
-//	 Session Encryption by Ari Kuorikoski <ari.kuorikoski@finebyte.com>
+/**
+ * ADOdb Session Management
+ *
+ * @deprecated
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ * @author Ari Kuorikoski <ari.kuorikoski@finebyte.com>
+ */
+
 class MD5Crypt{
 		function keyED($txt,$encrypt_key)
 		{
diff --git a/tests/benchmark.php b/tests/benchmark.php
index 4a982e41..5799031d 100644
--- a/tests/benchmark.php
+++ b/tests/benchmark.php
@@ -1,24 +1,33 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
 <html>
 <head>
-	<title>ADODB Benchmarks</title>
+    <title>ADODB Benchmarks</title>
 </head>
 
 <body>
 <?php
-/*
-@version   v5.21.1-dev  Unreleased
-@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
-@copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence.
-
-  Benchmark code to test the speed to the ADODB library with different databases.
-  This is a simplistic benchmark to be used as the basis for further testing.
-  It should not be used as proof of the superiority of one database over the other.
-*/
+/**
+ * Benchmarking
+ *
+ * Benchmark code to test the speed to the ADODB library with different databases.
+ * This is a simplistic benchmark to be used as the basis for further testing.
+ * It should not be used as proof of the superiority of one database over the other.
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 
 $testmssql = true;
 //$testvfp = true;
diff --git a/tests/client.php b/tests/client.php
index af8569f1..8452da40 100644
--- a/tests/client.php
+++ b/tests/client.php
@@ -2,18 +2,27 @@
 <body bgcolor=white>
 <?php
 /**
- * @version   v5.21.1-dev  Unreleased
- * @copyright (c) 2001-2013 John Lim (jlim#natsoft.com). All rights reserved.
- * @copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
- * Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence.
+ * ADOdb tests - Proxy client
  *
- * set tabs to 8
+ * @link https://adodb.org/dokuwiki/doku.php?id=v5:proxy:proxy_index
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
  */
 
- // documentation on usage is at https://adodb.org/dokuwiki/doku.php?id=v5:proxy:proxy_index
-
  echo PHP_VERSION,'<br>';
  var_dump(parse_url('odbc_mssql://userserver/'));
  die();
diff --git a/tests/pdo.php b/tests/pdo.php
index 31ca5969..b1b54528 100644
--- a/tests/pdo.php
+++ b/tests/pdo.php
@@ -1,4 +1,23 @@
 <?php
+/**
+ * ADOdb tests -PDO.
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 error_reporting(E_ALL);
 include('../adodb.inc.php');
 
diff --git a/tests/test-active-record.php b/tests/test-active-record.php
index 8fb02caa..081527e0 100644
--- a/tests/test-active-record.php
+++ b/tests/test-active-record.php
@@ -1,4 +1,23 @@
 <?php
+/**
+ * ADOdb tests.
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 
 	include_once('../adodb.inc.php');
 	include_once('../adodb-active-record.inc.php');
diff --git a/tests/test-active-recs2.php b/tests/test-active-recs2.php
index f5898fcd..a9fcbc03 100644
--- a/tests/test-active-recs2.php
+++ b/tests/test-active-recs2.php
@@ -1,4 +1,24 @@
 <?php
+/**
+ * ADOdb tests.
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
+
 error_reporting(E_ALL);
 include('../adodb.inc.php');
 
diff --git a/tests/test-active-relations.php b/tests/test-active-relations.php
index 7a98d479..bb013759 100644
--- a/tests/test-active-relations.php
+++ b/tests/test-active-relations.php
@@ -1,4 +1,23 @@
 <?php
+/**
+ * ADOdb tests.
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 
 	include_once('../adodb.inc.php');
 	include_once('../adodb-active-record.inc.php');
diff --git a/tests/test-active-relationsx.php b/tests/test-active-relationsx.php
index 0f28f728..4d3a80db 100644
--- a/tests/test-active-relationsx.php
+++ b/tests/test-active-relationsx.php
@@ -1,4 +1,24 @@
 <?php
+/**
+ * ADOdb tests.
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
+
 global $err_count;
 $err_count = 0;
 
diff --git a/tests/test-datadict.php b/tests/test-datadict.php
index 071ebf34..5caea253 100644
--- a/tests/test-datadict.php
+++ b/tests/test-datadict.php
@@ -1,16 +1,23 @@
 <?php
-/*
-
-  @version   v5.21.1-dev  Unreleased
-  @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
-  @copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence.
-
-  Set tabs to 4 for best viewing.
-
-*/
+/**
+ * ADOdb tests.
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 
 error_reporting(E_ALL);
 include_once('../adodb.inc.php');
diff --git a/tests/test-perf.php b/tests/test-perf.php
index 62465bef..4c83c17e 100644
--- a/tests/test-perf.php
+++ b/tests/test-perf.php
@@ -1,4 +1,23 @@
 <?php
+/**
+ * ADOdb tests.
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 
 include_once('../adodb-perf.inc.php');
 
diff --git a/tests/test-pgblob.php b/tests/test-pgblob.php
index 3add99e6..4c8bd167 100644
--- a/tests/test-pgblob.php
+++ b/tests/test-pgblob.php
@@ -1,4 +1,23 @@
 <?php
+/**
+ * ADOdb tests.
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 
 function getmicrotime()
 {
diff --git a/tests/test-php5.php b/tests/test-php5.php
index e29d3fe3..6d8758b1 100644
--- a/tests/test-php5.php
+++ b/tests/test-php5.php
@@ -1,15 +1,24 @@
 <?php
-/*
-  @version   v5.21.1-dev  Unreleased
-  @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
-  @copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence.
-  Set tabs to 8.
+/**
+ * ADOdb tests.
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
  */
 
-
 error_reporting(E_ALL);
 
 $path = dirname(__FILE__);
diff --git a/tests/test-xmlschema.php b/tests/test-xmlschema.php
index c56cfec8..e2d6dba8 100644
--- a/tests/test-xmlschema.php
+++ b/tests/test-xmlschema.php
@@ -1,6 +1,23 @@
-<?PHP
-
-// V4.50 6 July 2004
+<?php
+/**
+ * ADOdb tests.
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 
 error_reporting(E_ALL);
 include_once( "../adodb.inc.php" );
diff --git a/tests/test.php b/tests/test.php
index 1cafa8c9..fb23980b 100644
--- a/tests/test.php
+++ b/tests/test.php
@@ -1,16 +1,23 @@
 <?php
-/*
-@version   v5.21.1-dev  Unreleased
-@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
-@copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence.
-  Set tabs to 4 for best viewing.
-
-  Latest version is available at https://adodb.org/
-*/
-
+/**
+ * ADOdb tests.
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 
 //if (!defined('E_STRICT')) define('E_STRICT',0);
 error_reporting(E_ALL|E_STRICT);
diff --git a/tests/test2.php b/tests/test2.php
index eb3b0258..fd288dca 100644
--- a/tests/test2.php
+++ b/tests/test2.php
@@ -1,6 +1,23 @@
 <?php
-
-// BASIC ADO test
+/**
+ * * ADOdb tests - BASIC ADO test.
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 
 	include_once('../adodb.inc.php');
 
diff --git a/tests/test3.php b/tests/test3.php
index e6d72218..38c52853 100644
--- a/tests/test3.php
+++ b/tests/test3.php
@@ -1,15 +1,24 @@
 <?php
-/*
-  @version   v5.21.1-dev  Unreleased
-  @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
-  @copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence.
-  Set tabs to 8.
+/**
+ * * ADOdb tests.
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
  */
 
-
 error_reporting(E_ALL);
 
 $path = dirname(__FILE__);
diff --git a/tests/test4.php b/tests/test4.php
index 19b6efdd..cdaf5277 100644
--- a/tests/test4.php
+++ b/tests/test4.php
@@ -1,18 +1,22 @@
 <?php
-
 /**
- * @version   v5.21.1-dev  Unreleased
- * @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
- * @copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
- * Released under both BSD license and Lesser GPL library license.
- * Whenever there is any discrepancy between the two licenses,
- * the BSD license will take precedence.
+ * Test GetUpdateSQL and GetInsertSQL.
  *
- * Set tabs to 4 for best viewing.
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
  *
- * Latest version is available at https://adodb.org/
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
  *
- * Test GetUpdateSQL and GetInsertSQL.
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
  */
 
 error_reporting(E_ALL);
diff --git a/tests/test5.php b/tests/test5.php
index c8bda3b6..15327d1d 100644
--- a/tests/test5.php
+++ b/tests/test5.php
@@ -1,18 +1,23 @@
 <?php
-/*
-@version   v5.21.1-dev  Unreleased
-@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
-@copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence.
-  Set tabs to 4 for best viewing.
-
-  Latest version is available at https://adodb.org/
-*/
-
-
-// Select an empty record from the database
+/**
+ * * ADOdb tests - Select an empty record from the database.
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 
 include('../adodb.inc.php');
 include('../tohtml.inc.php');
diff --git a/tests/test_mssqlnative.php b/tests/test_mssqlnative.php
index 756e2447..9a4221fd 100644
--- a/tests/test_mssqlnative.php
+++ b/tests/test_mssqlnative.php
@@ -1,4 +1,23 @@
 <?php
+/**
+ * ADOdb tests.
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 
 error_reporting(E_ALL|E_STRICT);
 
diff --git a/tests/test_rs_array.php b/tests/test_rs_array.php
index 547b20ad..75848c04 100644
--- a/tests/test_rs_array.php
+++ b/tests/test_rs_array.php
@@ -1,4 +1,23 @@
 <?php
+/**
+ * ADOdb tests.
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 
 include_once('../adodb.inc.php');
 $rs = new ADORecordSet_array();
diff --git a/tests/testcache.php b/tests/testcache.php
index 2c2d2015..bf8676b9 100644
--- a/tests/testcache.php
+++ b/tests/testcache.php
@@ -1,17 +1,25 @@
 <html>
 <body>
 <?php
-/*
-@version   v5.21.1-dev  Unreleased
-@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
-@copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence.
-  Set tabs to 4 for best viewing.
-
-  Latest version is available at https://adodb.org/
-*/
+/**
+ * ADOdb tests.
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 
 $ADODB_CACHE_DIR = dirname(tempnam('/tmp',''));
 include("../adodb.inc.php");
diff --git a/tests/testdatabases.inc.php b/tests/testdatabases.inc.php
index 3f283e86..8c6358a4 100644
--- a/tests/testdatabases.inc.php
+++ b/tests/testdatabases.inc.php
@@ -1,16 +1,26 @@
 <?php
-
-/*
-@version   v5.21.1-dev  Unreleased
-@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
-@copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence.
-*/
-
- /* this file is used by the ADODB test program: test.php */
- ?>
+/**
+ * ADOdb tests.
+ *
+ * This file is used by the ADODB test program: test.php
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
+?>
 
 <table><tr valign=top><td>
 <form method=get>
diff --git a/tests/testgenid.php b/tests/testgenid.php
index 3310734a..3a8a9738 100644
--- a/tests/testgenid.php
+++ b/tests/testgenid.php
@@ -1,10 +1,27 @@
 <?php
-/*
-	V4.50 6 July 2004
+/**
+ * ADOdb tests - ID generation.
+ *
+ * Run multiple copies of this php script at the same time
+ * to test unique generation of id's in multiuser mode
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 
-	Run multiple copies of this php script at the same time
-	to test unique generation of id's in multiuser mode
-*/
 include_once('../adodb.inc.php');
 $testaccess = true;
 include_once('testdatabases.inc.php');
diff --git a/tests/testmssql.php b/tests/testmssql.php
index abae2f9a..fa8570b1 100644
--- a/tests/testmssql.php
+++ b/tests/testmssql.php
@@ -1,18 +1,22 @@
 <?php
-
 /**
- * @version   v5.21.1-dev  Unreleased
- * @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
- * @copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
- * Released under both BSD license and Lesser GPL library license.
- * Whenever there is any discrepancy between the two licenses,
- * the BSD license will take precedence.
+ * Test GetUpdateSQL and GetInsertSQL.
  *
- * Set tabs to 4 for best viewing.
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
  *
- * Latest version is available at https://adodb.org/
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
  *
- * Test GetUpdateSQL and GetInsertSQL.
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
  */
 
 error_reporting(E_ALL);
diff --git a/tests/testoci8.php b/tests/testoci8.php
index 2f9f77fc..81cf1857 100644
--- a/tests/testoci8.php
+++ b/tests/testoci8.php
@@ -1,17 +1,26 @@
 <html>
 <body>
 <?php
-/*
-@version   v5.21.1-dev  Unreleased
-@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
-@copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence.
-  Set tabs to 4 for best viewing.
+/**
+ * ADOdb tests - oci8
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 
-  Latest version is available at https://adodb.org/
-*/
 error_reporting(E_ALL | E_STRICT);
 include("../adodb.inc.php");
 include("../tohtml.inc.php");
diff --git a/tests/testoci8cursor.php b/tests/testoci8cursor.php
index 201d5c22..9dcf8ca9 100644
--- a/tests/testoci8cursor.php
+++ b/tests/testoci8cursor.php
@@ -1,19 +1,25 @@
 <?php
-/*
-@version   v5.21.1-dev  Unreleased
-@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
-@copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence.
-  Set tabs to 4 for best viewing.
-
-  Latest version is available at https://adodb.org/
-*/
+/**
+ * Test for Oracle Variable Cursors, which are treated as ADOdb recordsets.
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 
 /*
-	Test for Oracle Variable Cursors, which are treated as ADOdb recordsets.
-
 	We have 2 examples. The first shows us using the Parameter statement.
 	The second shows us using the new ExecuteCursor($sql, $cursorName)
 	function.
diff --git a/tests/testpaging.php b/tests/testpaging.php
index 4b133ce1..956d748e 100644
--- a/tests/testpaging.php
+++ b/tests/testpaging.php
@@ -1,15 +1,23 @@
 <?php
-/*
-@version   v5.21.1-dev  Unreleased
-@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
-@copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence.
-  Set tabs to 4 for best viewing.
-
-  Latest version is available at https://adodb.org/
-*/
+/**
+ * ADOdb tests - paging.
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 
 error_reporting(E_ALL);
 
diff --git a/tests/testpear.php b/tests/testpear.php
index 4ff7e15c..5949abe3 100644
--- a/tests/testpear.php
+++ b/tests/testpear.php
@@ -1,15 +1,23 @@
 <?php
-/*
-@version   v5.21.1-dev  Unreleased
-@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
-@copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence.
-  Set tabs to 4 for best viewing.
-
-  Latest version is available at https://adodb.org/
-*/
+/**
+ * ADOdb tests - PEAR DB.
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 
 error_reporting(E_ALL);
 
diff --git a/tests/testsessions.php b/tests/testsessions.php
index 10eb7f75..634da61c 100644
--- a/tests/testsessions.php
+++ b/tests/testsessions.php
@@ -1,4 +1,23 @@
 <?php
+/**
+ * ADOdb tests - Sessions.
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 
 /*
 @version   v5.21.1-dev  Unreleased
diff --git a/tests/time.php b/tests/time.php
index 8261e1e9..8760ccd4 100644
--- a/tests/time.php
+++ b/tests/time.php
@@ -1,4 +1,23 @@
 <?php
+/**
+ * ADOdb tests - Time.
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 
 include_once('../adodb-time.inc.php');
 adodb_date_test();
diff --git a/tests/tmssql.php b/tests/tmssql.php
index 0f81311a..6b855519 100644
--- a/tests/tmssql.php
+++ b/tests/tmssql.php
@@ -1,4 +1,23 @@
 <?php
+/**
+ * ADOdb tests.
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 error_reporting(E_ALL);
 ini_set('mssql.datetimeconvert',0);
 
diff --git a/toexport.inc.php b/toexport.inc.php
index 6fd884d3..66bbf542 100644
--- a/toexport.inc.php
+++ b/toexport.inc.php
@@ -1,14 +1,6 @@
 <?php
-
 /**
- * @version   v5.21.1-dev  Unreleased
- * @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
- * @copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
- * Released under both BSD license and Lesser GPL library license.
- * Whenever there is any discrepancy between the two licenses,
- * the BSD license will take precedence.
- *
- * Code to export recordsets in several formats:
+ * Export recordsets in several formats.
  *
  * AS VARIABLE
  * $s = rs2csv($rs); # comma-separated values
@@ -21,6 +13,22 @@
  *
  * TO STDOUT
  * rs2csvout($rs);
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
  */
 
 // returns a recordset as a csv string
diff --git a/tohtml.inc.php b/tohtml.inc.php
index 4d4b9ce5..e92c8b44 100644
--- a/tohtml.inc.php
+++ b/tohtml.inc.php
@@ -1,14 +1,29 @@
 <?php
-/*
-  @version   v5.21.1-dev  Unreleased
-  @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
-  @copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence.
-
-  Some pretty-printing by Chris Oxenreider <oxenreid@state.net>
-*/
+/**
+ * RecordSet to HTML Table
+ *
+ * Convert a recordset to a html table. Multiple tables are generated
+ * if the number of rows is > $gSQLBlockRows. This is because
+ * web browsers normally require the whole table to be downloaded
+ * before it can be rendered, so we break the output into several
+ * smaller, faster rendering tables.
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
 
 // specific code for tohtml
 GLOBAL $gSQLMaxRows,$gSQLBlockRows,$ADODB_ROUND;
@@ -17,14 +32,6 @@ $ADODB_ROUND=4; // rounding
 $gSQLMaxRows = 1000; // max no of rows to download
 $gSQLBlockRows=20; // max no of rows per table block
 
-// RecordSet to HTML Table
-//------------------------------------------------------------
-// Convert a recordset to a html table. Multiple tables are generated
-// if the number of rows is > $gSQLBlockRows. This is because
-// web browsers normally require the whole table to be downloaded
-// before it can be rendered, so we break the output into several
-// smaller faster rendering tables.
-//
 // $rs: the recordset
 // $ztabhtml: the table tag attributes (optional)
 // $zheaderarray: contains the replacement strings for the headers (optional)