diff --git a/app/app_model.php b/app/app_model.php
index 2aa3f5ca0..664d12d12 100644
--- a/app/app_model.php
+++ b/app/app_model.php
@@ -17,7 +17,6 @@
   * Purpose: AppModel
   * Enter description here...
   * 
-  *
   * @filesource 
   * @author Cake Authors/Developers
   * @copyright Copyright (c) 2005, Cake Authors/Developers
diff --git a/config/routes.php b/config/routes.php
index 9ef2c559f..e6a2b26fb 100644
--- a/config/routes.php
+++ b/config/routes.php
@@ -3,20 +3,14 @@
 // + $Id$
 // +------------------------------------------------------------------+ //
 // + Cake <https://developers.nextco.com/cake/>                       + //
-// + Copyright: (c) 2005 Cake Authors/Developers                      + //
-// +                                                                  + //
+// + Copyright: (c) 2005, Cake Authors/Developers                     + //
 // + Author(s): Michal Tatarynowicz aka Pies <tatarynowicz@gmail.com> + //
 // +            Larry E. Masters aka PhpNut <nut@phpnut.com>          + //
 // +            Kamil Dzielinski aka Brego <brego.dk@gmail.com>       + //
-// +                                                                  + //
 // +------------------------------------------------------------------+ //
 // + Licensed under The MIT License                                   + //
 // + Redistributions of files must retain the above copyright notice. + //
-// + You may not use this file except in compliance with the License. + //
-// +                                                                  + //
-// + You may obtain a copy of the License at:                         + //
-// + License page: http://www.opensource.org/licenses/mit-license.php + //
-// +------------------------------------------------------------------+ //
+// + See: http://www.opensource.org/licenses/mit-license.php          + //
 //////////////////////////////////////////////////////////////////////////
 
 /**
@@ -24,9 +18,7 @@
   * Enter description here...
   *
   * @filesource 
-  * @author Michal Tatarynowicz <tatarynowicz@gmail.com>
-  * @author Larry E. Masters aka PhpNut <nut@phpnut.com>
-  * @author Kamil Dzielinski aka Brego <brego.dk@gmail.com>
+  * @author Cake Authors/Developers
   * @copyright Copyright (c) 2005, Cake Authors/Developers
   * @link https://developers.nextco.com/cake/wiki/Authors Authors/Developers
   * @package cake
diff --git a/config/routes.php.default b/config/routes.php.default
index 9ef2c559f..e6a2b26fb 100644
--- a/config/routes.php.default
+++ b/config/routes.php.default
@@ -3,20 +3,14 @@
 // + $Id$
 // +------------------------------------------------------------------+ //
 // + Cake <https://developers.nextco.com/cake/>                       + //
-// + Copyright: (c) 2005 Cake Authors/Developers                      + //
-// +                                                                  + //
+// + Copyright: (c) 2005, Cake Authors/Developers                     + //
 // + Author(s): Michal Tatarynowicz aka Pies <tatarynowicz@gmail.com> + //
 // +            Larry E. Masters aka PhpNut <nut@phpnut.com>          + //
 // +            Kamil Dzielinski aka Brego <brego.dk@gmail.com>       + //
-// +                                                                  + //
 // +------------------------------------------------------------------+ //
 // + Licensed under The MIT License                                   + //
 // + Redistributions of files must retain the above copyright notice. + //
-// + You may not use this file except in compliance with the License. + //
-// +                                                                  + //
-// + You may obtain a copy of the License at:                         + //
-// + License page: http://www.opensource.org/licenses/mit-license.php + //
-// +------------------------------------------------------------------+ //
+// + See: http://www.opensource.org/licenses/mit-license.php          + //
 //////////////////////////////////////////////////////////////////////////
 
 /**
@@ -24,9 +18,7 @@
   * Enter description here...
   *
   * @filesource 
-  * @author Michal Tatarynowicz <tatarynowicz@gmail.com>
-  * @author Larry E. Masters aka PhpNut <nut@phpnut.com>
-  * @author Kamil Dzielinski aka Brego <brego.dk@gmail.com>
+  * @author Cake Authors/Developers
   * @copyright Copyright (c) 2005, Cake Authors/Developers
   * @link https://developers.nextco.com/cake/wiki/Authors Authors/Developers
   * @package cake
diff --git a/docs/COPYING.txt b/docs/COPYING.txt
index d807c88e5..10b40f125 100644
--- a/docs/COPYING.txt
+++ b/docs/COPYING.txt
@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright (c) 2005
+Copyright: (c) 2005, Cake Authors/Developers
                Michal Tatarynowicz aka Pies <tatarynowicz@gmail.com>
                Larry E. Masters aka PhpNut <nut@phpnut.com>
                Kamil Dzielinski aka Brego <brego.dk@gmail.com>
diff --git a/docs/LICENSE.txt b/docs/LICENSE.txt
index d807c88e5..10b40f125 100644
--- a/docs/LICENSE.txt
+++ b/docs/LICENSE.txt
@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright (c) 2005
+Copyright: (c) 2005, Cake Authors/Developers
                Michal Tatarynowicz aka Pies <tatarynowicz@gmail.com>
                Larry E. Masters aka PhpNut <nut@phpnut.com>
                Kamil Dzielinski aka Brego <brego.dk@gmail.com>
diff --git a/libs/basics.php b/libs/basics.php
index 526ca2cdd..f502544cf 100644
--- a/libs/basics.php
+++ b/libs/basics.php
@@ -3,20 +3,14 @@
 // + $Id$
 // +------------------------------------------------------------------+ //
 // + Cake <https://developers.nextco.com/cake/>                       + //
-// + Copyright: (c) 2005 Cake Authors/Developers                      + //
-// +                                                                  + //
+// + Copyright: (c) 2005, Cake Authors/Developers                     + //
 // + Author(s): Michal Tatarynowicz aka Pies <tatarynowicz@gmail.com> + //
 // +            Larry E. Masters aka PhpNut <nut@phpnut.com>          + //
 // +            Kamil Dzielinski aka Brego <brego.dk@gmail.com>       + //
-// +                                                                  + //
 // +------------------------------------------------------------------+ //
 // + Licensed under The MIT License                                   + //
 // + Redistributions of files must retain the above copyright notice. + //
-// + You may not use this file except in compliance with the License. + //
-// +                                                                  + //
-// + You may obtain a copy of the License at:                         + //
-// + License page: http://www.opensource.org/licenses/mit-license.php + //
-// +------------------------------------------------------------------+ //
+// + See: http://www.opensource.org/licenses/mit-license.php          + //
 //////////////////////////////////////////////////////////////////////////
 
 /**
@@ -24,9 +18,7 @@
   * Basic Cake functionalities.
   * 
   * @filesource 
-  * @author Michal Tatarynowicz <tatarynowicz@gmail.com>
-  * @author Larry E. Masters aka PhpNut <nut@phpnut.com>
-  * @author Kamil Dzielinski aka Brego <brego.dk@gmail.com>
+  * @author Cake Authors/Developers
   * @copyright Copyright (c) 2005, Cake Authors/Developers
   * @link https://developers.nextco.com/cake/wiki/Authors Authors/Developers
   * @package cake
diff --git a/libs/controller.php b/libs/controller.php
index f41528445..28522fc38 100644
--- a/libs/controller.php
+++ b/libs/controller.php
@@ -3,20 +3,14 @@
 // + $Id$
 // +------------------------------------------------------------------+ //
 // + Cake <https://developers.nextco.com/cake/>                       + //
-// + Copyright: (c) 2005 Cake Authors/Developers                      + //
-// +                                                                  + //
+// + Copyright: (c) 2005, Cake Authors/Developers                     + //
 // + Author(s): Michal Tatarynowicz aka Pies <tatarynowicz@gmail.com> + //
 // +            Larry E. Masters aka PhpNut <nut@phpnut.com>          + //
 // +            Kamil Dzielinski aka Brego <brego.dk@gmail.com>       + //
-// +                                                                  + //
 // +------------------------------------------------------------------+ //
 // + Licensed under The MIT License                                   + //
 // + Redistributions of files must retain the above copyright notice. + //
-// + You may not use this file except in compliance with the License. + //
-// +                                                                  + //
-// + You may obtain a copy of the License at:                         + //
-// + License page: http://www.opensource.org/licenses/mit-license.php + //
-// +------------------------------------------------------------------+ //
+// + See: http://www.opensource.org/licenses/mit-license.php          + //
 //////////////////////////////////////////////////////////////////////////
 
 /**
@@ -27,9 +21,7 @@
   * and creates the model object if proper class exists.
   * 
   * @filesource 
-  * @author Michal Tatarynowicz <tatarynowicz@gmail.com>
-  * @author Larry E. Masters aka PhpNut <nut@phpnut.com>
-  * @author Kamil Dzielinski aka Brego <brego.dk@gmail.com>
+  * @author Cake Authors/Developers
   * @copyright Copyright (c) 2005, Cake Authors/Developers
   * @link https://developers.nextco.com/cake/wiki/Authors Authors/Developers
   * @package cake
diff --git a/libs/db_factory.php b/libs/db_factory.php
index 3fa247a72..e77173040 100644
--- a/libs/db_factory.php
+++ b/libs/db_factory.php
@@ -1,4 +1,17 @@
 <?PHP
+//////////////////////////////////////////////////////////////////////////
+// + $Id: $
+// +------------------------------------------------------------------+ //
+// + Cake <https://developers.nextco.com/cake/>                       + //
+// + Copyright: (c) 2005, Cake Authors/Developers                     + //
+// + Author(s): Michal Tatarynowicz aka Pies <tatarynowicz@gmail.com> + //
+// +            Larry E. Masters aka PhpNut <nut@phpnut.com>          + //
+// +            Kamil Dzielinski aka Brego <brego.dk@gmail.com>       + //
+// +------------------------------------------------------------------+ //
+// + Licensed under The MIT License                                   + //
+// + Redistributions of files must retain the above copyright notice. + //
+// + See: http://www.opensource.org/licenses/mit-license.php          + //
+//////////////////////////////////////////////////////////////////////////
 /**
   * Purpose: DbFactory
   * 
@@ -6,14 +19,12 @@
   * Creates DBO-descendant objects from a given db connection configuration
   *
   * @filesource 
-  * @author Michal Tatarynowicz <tatarynowicz@gmail.com>
-  * @author Larry E. Masters aka PhpNut <nut@phpnut.com>
-  * @author Kamil Dzielinski aka Brego <brego.dk@gmail.com>
+  * @author Cake Authors/Developers
   * @copyright Copyright (c) 2005, Cake Authors/Developers
   * @link https://developers.nextco.com/cake/wiki/Authors Authors/Developers
-  * @version $Revision: 113 $
-  * @modifiedby $LastChangedBy: pies $
-  * @lastmodified $Date: 2005-05-17 00:53:41 +0200 (Tue, 17 May 2005) $
+  * @version $Revision: $
+  * @modifiedby $LastChangedBy: $
+  * @lastmodified $Date: $
   * @license http://www.opensource.org/licenses/mit-license.php The MIT License
   *
   */
diff --git a/libs/dbo.php b/libs/dbo.php
index 9853fbc4f..1bb4cd5fd 100644
--- a/libs/dbo.php
+++ b/libs/dbo.php
@@ -3,20 +3,14 @@
 // + $Id$
 // +------------------------------------------------------------------+ //
 // + Cake <https://developers.nextco.com/cake/>                       + //
-// + Copyright: (c) 2005 Cake Authors/Developers                      + //
-// +                                                                  + //
+// + Copyright: (c) 2005, Cake Authors/Developers                     + //
 // + Author(s): Michal Tatarynowicz aka Pies <tatarynowicz@gmail.com> + //
 // +            Larry E. Masters aka PhpNut <nut@phpnut.com>          + //
 // +            Kamil Dzielinski aka Brego <brego.dk@gmail.com>       + //
-// +                                                                  + //
 // +------------------------------------------------------------------+ //
 // + Licensed under The MIT License                                   + //
 // + Redistributions of files must retain the above copyright notice. + //
-// + You may not use this file except in compliance with the License. + //
-// +                                                                  + //
-// + You may obtain a copy of the License at:                         + //
-// + License page: http://www.opensource.org/licenses/mit-license.php + //
-// +------------------------------------------------------------------+ //
+// + See: http://www.opensource.org/licenses/mit-license.php          + //
 //////////////////////////////////////////////////////////////////////////
 
 /**
@@ -56,9 +50,7 @@
   * </code>
   *
   * @filesource 
-  * @author Michal Tatarynowicz <tatarynowicz@gmail.com>
-  * @author Larry E. Masters aka PhpNut <nut@phpnut.com>
-  * @author Kamil Dzielinski aka Brego <brego.dk@gmail.com>
+  * @author Cake Authors/Developers
   * @copyright Copyright (c) 2005, Cake Authors/Developers
   * @link https://developers.nextco.com/cake/wiki/Authors Authors/Developers
   * @package cake
diff --git a/libs/dbo_adodb.php b/libs/dbo_adodb.php
index f135538c4..0592276e5 100644
--- a/libs/dbo_adodb.php
+++ b/libs/dbo_adodb.php
@@ -3,20 +3,14 @@
 // + $Id$
 // +------------------------------------------------------------------+ //
 // + Cake <https://developers.nextco.com/cake/>                       + //
-// + Copyright: (c) 2005 Cake Authors/Developers                      + //
-// +                                                                  + //
+// + Copyright: (c) 2005, Cake Authors/Developers                     + //
 // + Author(s): Michal Tatarynowicz aka Pies <tatarynowicz@gmail.com> + //
 // +            Larry E. Masters aka PhpNut <nut@phpnut.com>          + //
 // +            Kamil Dzielinski aka Brego <brego.dk@gmail.com>       + //
-// +                                                                  + //
 // +------------------------------------------------------------------+ //
 // + Licensed under The MIT License                                   + //
 // + Redistributions of files must retain the above copyright notice. + //
-// + You may not use this file except in compliance with the License. + //
-// +                                                                  + //
-// + You may obtain a copy of the License at:                         + //
-// + License page: http://www.opensource.org/licenses/mit-license.php + //
-// +------------------------------------------------------------------+ //
+// + See: http://www.opensource.org/licenses/mit-license.php          + //
 //////////////////////////////////////////////////////////////////////////
 
 /**
@@ -24,9 +18,7 @@
   * AdoDB layer for DBO
   * 
   * @filesource 
-  * @author Michal Tatarynowicz <tatarynowicz@gmail.com>
-  * @author Larry E. Masters aka PhpNut <nut@phpnut.com>
-  * @author Kamil Dzielinski aka Brego <brego.dk@gmail.com>
+  * @author Cake Authors/Developers
   * @copyright Copyright (c) 2005, Cake Authors/Developers
   * @link https://developers.nextco.com/cake/wiki/Authors Authors/Developers
   * @package cake
diff --git a/libs/dbo_mysql.php b/libs/dbo_mysql.php
index a2e41e070..1cca3f932 100644
--- a/libs/dbo_mysql.php
+++ b/libs/dbo_mysql.php
@@ -24,9 +24,7 @@
   * MySQL layer for DBO
   * 
   * @filesource 
-  * @author Michal Tatarynowicz <tatarynowicz@gmail.com>
-  * @author Larry E. Masters aka PhpNut <nut@phpnut.com>
-  * @author Kamil Dzielinski aka Brego <brego.dk@gmail.com>
+  * @author Cake Authors/Developers
   * @copyright Copyright (c) 2005, Cake Authors/Developers
   * @link https://developers.nextco.com/cake/wiki/Authors Authors/Developers
   * @package cake
diff --git a/libs/dbo_postgres.php b/libs/dbo_postgres.php
index 8619e95ac..40091b4df 100644
--- a/libs/dbo_postgres.php
+++ b/libs/dbo_postgres.php
@@ -3,20 +3,14 @@
 // + $Id$
 // +------------------------------------------------------------------+ //
 // + Cake <https://developers.nextco.com/cake/>                       + //
-// + Copyright: (c) 2005 Cake Authors/Developers                      + //
-// +                                                                  + //
+// + Copyright: (c) 2005, Cake Authors/Developers                     + //
 // + Author(s): Michal Tatarynowicz aka Pies <tatarynowicz@gmail.com> + //
 // +            Larry E. Masters aka PhpNut <nut@phpnut.com>          + //
 // +            Kamil Dzielinski aka Brego <brego.dk@gmail.com>       + //
-// +                                                                  + //
 // +------------------------------------------------------------------+ //
 // + Licensed under The MIT License                                   + //
 // + Redistributions of files must retain the above copyright notice. + //
-// + You may not use this file except in compliance with the License. + //
-// +                                                                  + //
-// + You may obtain a copy of the License at:                         + //
-// + License page: http://www.opensource.org/licenses/mit-license.php + //
-// +------------------------------------------------------------------+ //
+// + See: http://www.opensource.org/licenses/mit-license.php          + //
 //////////////////////////////////////////////////////////////////////////
 
 /**
@@ -24,9 +18,7 @@
   * Enter description here...
   * 
   * @filesource 
-  * @author Michal Tatarynowicz <tatarynowicz@gmail.com>
-  * @author Larry E. Masters aka PhpNut <nut@phpnut.com>
-  * @author Kamil Dzielinski aka Brego <brego.dk@gmail.com>
+  * @author Cake Authors/Developers
   * @copyright Copyright (c) 2005, Cake Authors/Developers
   * @link https://developers.nextco.com/cake/wiki/Authors Authors/Developers
   * @package cake
diff --git a/libs/dispatcher.php b/libs/dispatcher.php
index 490fe9b3a..e3d8f2df6 100644
--- a/libs/dispatcher.php
+++ b/libs/dispatcher.php
@@ -3,20 +3,14 @@
 // + $Id$
 // +------------------------------------------------------------------+ //
 // + Cake <https://developers.nextco.com/cake/>                       + //
-// + Copyright: (c) 2005 Cake Authors/Developers                      + //
-// +                                                                  + //
+// + Copyright: (c) 2005, Cake Authors/Developers                     + //
 // + Author(s): Michal Tatarynowicz aka Pies <tatarynowicz@gmail.com> + //
 // +            Larry E. Masters aka PhpNut <nut@phpnut.com>          + //
 // +            Kamil Dzielinski aka Brego <brego.dk@gmail.com>       + //
-// +                                                                  + //
 // +------------------------------------------------------------------+ //
 // + Licensed under The MIT License                                   + //
 // + Redistributions of files must retain the above copyright notice. + //
-// + You may not use this file except in compliance with the License. + //
-// +                                                                  + //
-// + You may obtain a copy of the License at:                         + //
-// + License page: http://www.opensource.org/licenses/mit-license.php + //
-// +------------------------------------------------------------------+ //
+// + See: http://www.opensource.org/licenses/mit-license.php          + //
 //////////////////////////////////////////////////////////////////////////
 
 /**
@@ -24,9 +18,7 @@
   * Dispatches the request, creating aproppriate models and controllers.
   * 
   * @filesource 
-  * @author Michal Tatarynowicz <tatarynowicz@gmail.com>
-  * @author Larry E. Masters aka PhpNut <nut@phpnut.com>
-  * @author Kamil Dzielinski aka Brego <brego.dk@gmail.com>
+  * @author Cake Authors/Developers
   * @copyright Copyright (c) 2005, Cake Authors/Developers
   * @link https://developers.nextco.com/cake/wiki/Authors Authors/Developers
   * @package cake
diff --git a/libs/error_messages.php b/libs/error_messages.php
index 34a3350c2..88774e499 100644
--- a/libs/error_messages.php
+++ b/libs/error_messages.php
@@ -3,20 +3,14 @@
 // + $Id$
 // +------------------------------------------------------------------+ //
 // + Cake <https://developers.nextco.com/cake/>                       + //
-// + Copyright: (c) 2005 Cake Authors/Developers                      + //
-// +                                                                  + //
+// + Copyright: (c) 2005, Cake Authors/Developers                     + //
 // + Author(s): Michal Tatarynowicz aka Pies <tatarynowicz@gmail.com> + //
 // +            Larry E. Masters aka PhpNut <nut@phpnut.com>          + //
 // +            Kamil Dzielinski aka Brego <brego.dk@gmail.com>       + //
-// +                                                                  + //
 // +------------------------------------------------------------------+ //
 // + Licensed under The MIT License                                   + //
 // + Redistributions of files must retain the above copyright notice. + //
-// + You may not use this file except in compliance with the License. + //
-// +                                                                  + //
-// + You may obtain a copy of the License at:                         + //
-// + License page: http://www.opensource.org/licenses/mit-license.php + //
-// +------------------------------------------------------------------+ //
+// + See: http://www.opensource.org/licenses/mit-license.php          + //
 //////////////////////////////////////////////////////////////////////////
 
 /**
diff --git a/libs/flay.php b/libs/flay.php
index ccf95effd..455991c91 100644
--- a/libs/flay.php
+++ b/libs/flay.php
@@ -3,20 +3,14 @@
 // + $Id$
 // +------------------------------------------------------------------+ //
 // + Cake <https://developers.nextco.com/cake/>                       + //
-// + Copyright: (c) 2005 Cake Authors/Developers                      + //
-// +                                                                  + //
+// + Copyright: (c) 2005, Cake Authors/Developers                     + //
 // + Author(s): Michal Tatarynowicz aka Pies <tatarynowicz@gmail.com> + //
 // +            Larry E. Masters aka PhpNut <nut@phpnut.com>          + //
 // +            Kamil Dzielinski aka Brego <brego.dk@gmail.com>       + //
-// +                                                                  + //
 // +------------------------------------------------------------------+ //
 // + Licensed under The MIT License                                   + //
 // + Redistributions of files must retain the above copyright notice. + //
-// + You may not use this file except in compliance with the License. + //
-// +                                                                  + //
-// + You may obtain a copy of the License at:                         + //
-// + License page: http://www.opensource.org/licenses/mit-license.php + //
-// +------------------------------------------------------------------+ //
+// + See: http://www.opensource.org/licenses/mit-license.php          + //
 //////////////////////////////////////////////////////////////////////////
 
 /**
diff --git a/libs/model.php b/libs/model.php
index b2ca993d9..2fbac429a 100644
--- a/libs/model.php
+++ b/libs/model.php
@@ -3,20 +3,14 @@
 // + $Id$
 // +------------------------------------------------------------------+ //
 // + Cake <https://developers.nextco.com/cake/>                       + //
-// + Copyright: (c) 2005 Cake Authors/Developers                      + //
-// +                                                                  + //
+// + Copyright: (c) 2005, Cake Authors/Developers                     + //
 // + Author(s): Michal Tatarynowicz aka Pies <tatarynowicz@gmail.com> + //
 // +            Larry E. Masters aka PhpNut <nut@phpnut.com>          + //
 // +            Kamil Dzielinski aka Brego <brego.dk@gmail.com>       + //
-// +                                                                  + //
 // +------------------------------------------------------------------+ //
 // + Licensed under The MIT License                                   + //
 // + Redistributions of files must retain the above copyright notice. + //
-// + You may not use this file except in compliance with the License. + //
-// +                                                                  + //
-// + You may obtain a copy of the License at:                         + //
-// + License page: http://www.opensource.org/licenses/mit-license.php + //
-// +------------------------------------------------------------------+ //
+// + See: http://www.opensource.org/licenses/mit-license.php          + //
 //////////////////////////////////////////////////////////////////////////
 
 /**
diff --git a/libs/router.php b/libs/router.php
index 373ce584d..6d319ae5a 100644
--- a/libs/router.php
+++ b/libs/router.php
@@ -3,20 +3,14 @@
 // + $Id$
 // +------------------------------------------------------------------+ //
 // + Cake <https://developers.nextco.com/cake/>                       + //
-// + Copyright: (c) 2005 Cake Authors/Developers                      + //
-// +                                                                  + //
+// + Copyright: (c) 2005, Cake Authors/Developers                     + //
 // + Author(s): Michal Tatarynowicz aka Pies <tatarynowicz@gmail.com> + //
 // +            Larry E. Masters aka PhpNut <nut@phpnut.com>          + //
 // +            Kamil Dzielinski aka Brego <brego.dk@gmail.com>       + //
-// +                                                                  + //
 // +------------------------------------------------------------------+ //
 // + Licensed under The MIT License                                   + //
 // + Redistributions of files must retain the above copyright notice. + //
-// + You may not use this file except in compliance with the License. + //
-// +                                                                  + //
-// + You may obtain a copy of the License at:                         + //
-// + License page: http://www.opensource.org/licenses/mit-license.php + //
-// +------------------------------------------------------------------+ //
+// + See: http://www.opensource.org/licenses/mit-license.php          + //
 //////////////////////////////////////////////////////////////////////////
 
 /**
diff --git a/libs/template.php b/libs/template.php
index 374aba58d..950db5725 100644
--- a/libs/template.php
+++ b/libs/template.php
@@ -3,20 +3,14 @@
 // + $Id$
 // +------------------------------------------------------------------+ //
 // + Cake <https://developers.nextco.com/cake/>                       + //
-// + Copyright: (c) 2005 Cake Authors/Developers                      + //
-// +                                                                  + //
+// + Copyright: (c) 2005, Cake Authors/Developers                     + //
 // + Author(s): Michal Tatarynowicz aka Pies <tatarynowicz@gmail.com> + //
 // +            Larry E. Masters aka PhpNut <nut@phpnut.com>          + //
 // +            Kamil Dzielinski aka Brego <brego.dk@gmail.com>       + //
-// +                                                                  + //
 // +------------------------------------------------------------------+ //
 // + Licensed under The MIT License                                   + //
 // + Redistributions of files must retain the above copyright notice. + //
-// + You may not use this file except in compliance with the License. + //
-// +                                                                  + //
-// + You may obtain a copy of the License at:                         + //
-// + License page: http://www.opensource.org/licenses/mit-license.php + //
-// +------------------------------------------------------------------+ //
+// + See: http://www.opensource.org/licenses/mit-license.php          + //
 //////////////////////////////////////////////////////////////////////////
 
 /**
diff --git a/public/dispatch.php b/public/dispatch.php
index 00326dcda..ff9cdc26a 100644
--- a/public/dispatch.php
+++ b/public/dispatch.php
@@ -3,20 +3,14 @@
 // + $Id$
 // +------------------------------------------------------------------+ //
 // + Cake <https://developers.nextco.com/cake/>                       + //
-// + Copyright: (c) 2005 Cake Authors/Developers                      + //
-// +                                                                  + //
+// + Copyright: (c) 2005, Cake Authors/Developers                     + //
 // + Author(s): Michal Tatarynowicz aka Pies <tatarynowicz@gmail.com> + //
 // +            Larry E. Masters aka PhpNut <nut@phpnut.com>          + //
 // +            Kamil Dzielinski aka Brego <brego.dk@gmail.com>       + //
-// +                                                                  + //
 // +------------------------------------------------------------------+ //
 // + Licensed under The MIT License                                   + //
 // + Redistributions of files must retain the above copyright notice. + //
-// + You may not use this file except in compliance with the License. + //
-// +                                                                  + //
-// + You may obtain a copy of the License at:                         + //
-// + License page: http://www.opensource.org/licenses/mit-license.php + //
-// +------------------------------------------------------------------+ //
+// + See: http://www.opensource.org/licenses/mit-license.php          + //
 //////////////////////////////////////////////////////////////////////////
 
 /**