Revert changes since Standardized file headers merge

The conflicts resolution applied when merging the Standardized file
headers (commit e9dcce3df24912ad869d0193f0b419f2309101fc) was seriously
messed up, actually overwriting a number of changes in the master
branch.

Rather than trying to go and fix things one by one which has a high risk
of messing things further, it's easier to redo the merge from a clean
slate, so this commit reverts the following:

- "Merge branch 'hotfix/5.21' Standardized file headers",
  e9dcce3df24912ad869d0193f0b419f2309101fc
- "Merge tag 'v5.21.1'",
  5f437df3104159d5d659f60e31bef8d33c34995f
- "Reset version to 5.22.0-dev"
  af9234a525c3255af051a330164486d73be4c63a
- "Fix incorrect resolution of merge conflicts"
  a6733f61b0165b366c8d2c70d9af82edc3881951.
- "Fix syntax error in toexport.inc.php"
  20b01e83cb61b6b2460f64c7d1277c5f4cc28574.

Fixes #751

4 files changed, 9 insertions, 68 deletions

diff --git a/scripts/buildrelease.py b/scripts/buildrelease.py
index cba40e67..0cefb5f7 100755
--- a/scripts/buildrelease.py
+++ b/scripts/buildrelease.py
@@ -5,22 +5,6 @@ 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 c4159dd5..3e382b17 100644
--- a/scripts/fix-static-docs.php
+++ b/scripts/fix-static-docs.php
@@ -1,25 +1,12 @@
 <?php 
 /**
- * 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
- */
+* 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
+*/
 
 /**
 * Recurses a directory and deletes files inside
@@ -230,3 +217,5 @@ 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 5590f37f..57ee9499 100755
--- a/scripts/updateversion.py
+++ b/scripts/updateversion.py
@@ -3,22 +3,6 @@
 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 7d801eed..e93e0f51 100755
--- a/scripts/uploadrelease.py
+++ b/scripts/uploadrelease.py
@@ -3,22 +3,6 @@
 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