diff --git a/lib/alert/AlertContent.inc b/lib/alert/AlertContent.inc
index ab34847..51c62b8 100644
--- a/lib/alert/AlertContent.inc
+++ b/lib/alert/AlertContent.inc
@@ -1,18 +1,30 @@
 <?php
 /**
- * 
  * $Id$
- * 
+ *
  * Contains the content for subscription alerts.  Also responsible for inserting dynamic
  * data into the notification text before the alert is sent
  *
- * Licensed under the GNU GPL. For full terms see the file COPYING.
+ * Copyright (c) 2003 Jam Warehouse http://www.jamwarehouse.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.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  * @version $Revision$ 
  * @author Michael Joseph <michael@jamwarehouse.com>, Jam Warehouse (Pty) Ltd, South Africa
- *
  * @package lib.subscriptions
- */
+ */ 
 class AlertContent {
 	
 	/**
diff --git a/lib/alert/delivery/EmailAlert.inc b/lib/alert/delivery/EmailAlert.inc
index 3980227..e06bfc8 100644
--- a/lib/alert/delivery/EmailAlert.inc
+++ b/lib/alert/delivery/EmailAlert.inc
@@ -1,17 +1,28 @@
 <?php
 require_once("$default->fileSystemRoot/lib/email/Email.inc");
-
 /**
- * 
  * $Id$
- * 
+ *
  * Sends an email (subscription) alert.
  *
- * Licensed under the GNU GPL. For full terms see the file COPYING.
+ * Copyright (c) 2003 Jam Warehouse http://www.jamwarehouse.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.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  * @version $Revision$ 
  * @author Michael Joseph <michael@jamwarehouse.com>, Jam Warehouse (Pty) Ltd, South Africa
- *
  * @package lib.alert.delivery
  */
 class EmailAlert {
diff --git a/lib/alert/delivery/SMSAlert.inc b/lib/alert/delivery/SMSAlert.inc
index b3e7eb2..509cb3e 100644
--- a/lib/alert/delivery/SMSAlert.inc
+++ b/lib/alert/delivery/SMSAlert.inc
@@ -1,15 +1,27 @@
 <?php
 /**
- * 
  * $Id$
- * 
- * Sends an sms (subscription) alert.
  *
- * Licensed under the GNU GPL. For full terms see the file COPYING.
+ * Sends an sms (subscription) alert (UNIMPLEMENTED).
+ *
+ * Copyright (c) 2003 Jam Warehouse http://www.jamwarehouse.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.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  * @version $Revision$ 
  * @author Michael Joseph <michael@jamwarehouse.com>, Jam Warehouse (Pty) Ltd, South Africa
- *
  * @package lib.alert.delivery
  */
 class SMSAlert {
diff --git a/lib/archiving/ArchiveRestorationRequest.inc b/lib/archiving/ArchiveRestorationRequest.inc
index b433dd2..ffa18d0 100644
--- a/lib/archiving/ArchiveRestorationRequest.inc
+++ b/lib/archiving/ArchiveRestorationRequest.inc
@@ -1,17 +1,29 @@
 <?php
-
 /**
  * $Id$
+ *
+ * Represents restoration requests for a document.
+ *
+ * Copyright (c) 2003 Jam Warehouse http://www.jamwarehouse.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.
  * 
- * Represents restoration request for a document
+ * 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.
  * 
- * Licensed under the GNU GPL. For full terms see the file COPYING.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  * @version $Revision$
  * @author Michael Joseph <michael@jamwarehouse.com>, Jam Warehouse (Pty) Ltd, South Africa
  * @package lib.archiving 
- */
-
+ */ 
 class ArchiveRestorationRequest {
 
 	/**
diff --git a/lib/archiving/ArchivingSettings.inc b/lib/archiving/ArchivingSettings.inc
index deac671..feadeb5 100644
--- a/lib/archiving/ArchivingSettings.inc
+++ b/lib/archiving/ArchivingSettings.inc
@@ -1,17 +1,29 @@
 <?php
-
 /**
  * $Id$
- * 
+ *
  * Represents archive settings for a document.
+ *
+ * Copyright (c) 2003 Jam Warehouse http://www.jamwarehouse.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.
  * 
- * Licensed under the GNU GPL. For full terms see the file COPYING.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  * @version $Revision$
  * @author Michael Joseph <michael@jamwarehouse.com>, Jam Warehouse (Pty) Ltd, South Africa
  * @package lib.archiving 
  */
-
 class ArchivingSettings {
 
 	/**
diff --git a/lib/archiving/ArchivingType.inc b/lib/archiving/ArchivingType.inc
index 30cb103..303611c 100644
--- a/lib/archiving/ArchivingType.inc
+++ b/lib/archiving/ArchivingType.inc
@@ -1,17 +1,29 @@
 <?php
-
 /**
  * $Id$
+ *
+ * Represents archiving types.
+ *
+ * Copyright (c) 2003 Jam Warehouse http://www.jamwarehouse.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.
  * 
- * Represents archiving types
+ * 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.
  * 
- * Licensed under the GNU GPL. For full terms see the file COPYING.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  * @version $Revision$
  * @author Michael Joseph <michael@jamwarehouse.com>, Jam Warehouse (Pty) Ltd, South Africa
  * @package lib.archiving 
  */
-
 class ArchivingType {
 
 	/**
diff --git a/lib/archiving/DocumentArchiveSettingsFactory.inc b/lib/archiving/DocumentArchiveSettingsFactory.inc
index cc1d3dd..a1b823f 100644
--- a/lib/archiving/DocumentArchiveSettingsFactory.inc
+++ b/lib/archiving/DocumentArchiveSettingsFactory.inc
@@ -2,19 +2,31 @@
 require_once("$default->fileSystemRoot/lib/archiving/DocumentArchiving.inc");
 require_once("$default->fileSystemRoot/lib/archiving/ArchivingSettings.inc");
 require_once("$default->fileSystemRoot/lib/archiving/TimePeriod.inc");
-
 /**
  * $Id$
- *  
- * Business logic for setting document archive settings
  *
- * Licensed under the GNU GPL. For full terms see the file DOCS/COPYING.
+ * Business logic for setting document archive settings.
+ *
+ * Copyright (c) 2003 Jam Warehouse http://www.jamwarehouse.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.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  * @version $Revision$
  * @author Michael Joseph <michael@jamwarehouse.com>, Jam Warehouse (Pty) Ltd, South Africa
- * @package lib.archiving
+ * @package lib.archiving 
  */
-
 class DocumentArchiveSettingsFactory {
 	
 	function handleTimePeriod($iTimeUnitID, $iUnits) {
diff --git a/lib/archiving/DocumentArchiving.inc b/lib/archiving/DocumentArchiving.inc
index c4b0973..87d9ef0 100644
--- a/lib/archiving/DocumentArchiving.inc
+++ b/lib/archiving/DocumentArchiving.inc
@@ -1,19 +1,30 @@
 <?php
-
 /**
  * $Id$
+ *
+ * Represents archive settings for a document.
+ *
+ * Copyright (c) 2003 Jam Warehouse http://www.jamwarehouse.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.
  * 
- * Represents archive settings for a document
+ * 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.
  * 
- * Licensed under the GNU GPL. For full terms see the file COPYING.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  * @version $Revision$
  * @author Michael Joseph <michael@jamwarehouse.com>, Jam Warehouse (Pty) Ltd, South Africa
  * @package lib.archiving 
  */
-
 class DocumentArchiving {
-
 	/**
 	 * The primary key
 	 */
diff --git a/lib/archiving/TimePeriod.inc b/lib/archiving/TimePeriod.inc
index f4da3b3..52586fb 100644
--- a/lib/archiving/TimePeriod.inc
+++ b/lib/archiving/TimePeriod.inc
@@ -1,19 +1,30 @@
 <?php
-
 /**
  * $Id$
+ *
+ * Represents a time period.
+ *
+ * Copyright (c) 2003 Jam Warehouse http://www.jamwarehouse.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.
  * 
- * Represents a time period
+ * 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.
  * 
- * Licensed under the GNU GPL. For full terms see the file COPYING.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  * @version $Revision$
  * @author Michael Joseph <michael@jamwarehouse.com>, Jam Warehouse (Pty) Ltd, South Africa
  * @package lib.archiving 
  */
-
 class TimePeriod {
-
 	/**
 	 * The primary key
 	 */
diff --git a/lib/archiving/TimeUnit.inc b/lib/archiving/TimeUnit.inc
index 66dae30..070a566 100644
--- a/lib/archiving/TimeUnit.inc
+++ b/lib/archiving/TimeUnit.inc
@@ -1,17 +1,29 @@
 <?php
-
 /**
  * $Id$
+ *
+ * Represents time units.
+ *
+ * Copyright (c) 2003 Jam Warehouse http://www.jamwarehouse.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.
  * 
- * Represents time units
+ * 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.
  * 
- * Licensed under the GNU GPL. For full terms see the file COPYING.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  * @version $Revision$
  * @author Michael Joseph <michael@jamwarehouse.com>, Jam Warehouse (Pty) Ltd, South Africa
  * @package lib.archiving 
  */
-
 class TimeUnit {
 
 	/**