Redo Merge branch 'hotfix/5.21' Standardized file headers

Try to do it right this time...

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

Fixes #751

1 files changed, 17 insertions, 9 deletions

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