Merge recent changes from R1 into HEAD

1 files changed, 17 insertions, 6 deletions

diff --git a/copyrights.php b/copyrights.php
index 2ec258f..139c2e6 100644
--- a/copyrights.php
+++ b/copyrights.php
@@ -1,10 +1,21 @@
 <?php
-// $Header: /cvsroot/bitweaver/_bit_wiki/copyrights.php,v 1.1 2005/06/19 06:12:44 bitweaver Exp $
-// Copyright (c) 2002-2003, Luis Argerich, Garland Foster, Eduardo Polidor, et. al.
-// All Rights Reserved. See copyright.txt for details and a complete list of authors.
-// Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details.
-// This file sets up the information needed to display
-// the copyrights information box
+/**
+ * $Header: /cvsroot/bitweaver/_bit_wiki/copyrights.php,v 1.2 2005/06/28 07:46:27 spiderr Exp $
+ *
+ * Copyright (c) 2004 bitweaver.org
+ * Copyright (c) 2003 tikwiki.org
+ * Copyright (c) 2002-2003, Luis Argerich, Garland Foster, Eduardo Polidor, et. al.
+ * All Rights Reserved. See copyright.txt for details and a complete list of authors.
+ * Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details
+ *
+ * $Id: copyrights.php,v 1.2 2005/06/28 07:46:27 spiderr Exp $
+ * @package wiki
+ * @subpackage functions
+ */
+
+/**
+ * required setup
+ */
 require_once( '../bit_setup_inc.php' );
 if ($wiki_feature_copyrights != 'y') {
 	$smarty->assign('msg', tra("The copyright management feature is not enabled."));