Adjusted contributors file.

git-svn-id: https://code.elgg.org/elgg/trunk@1806 36083f99-b078-4883-b0ff-0f9b5a30f544

30 files changed, 100 insertions, 100 deletions

diff --git a/engine/handlers/cron_handler.php b/engine/handlers/cron_handler.php
index 2d3e0168b..dd58b5266 100644
--- a/engine/handlers/cron_handler.php
+++ b/engine/handlers/cron_handler.php
@@ -5,7 +5,7 @@
 	 * @package Elgg
 	 * @subpackage Core
 	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
-	 * @author Marcus Povey
+	 * @author Curverider Ltd
 	 * @copyright Curverider Ltd 2008
 	 * @link http://elgg.org/
 	 */
diff --git a/engine/handlers/xml-rpc_handler.php b/engine/handlers/xml-rpc_handler.php
index ca49559da..8697bef02 100644
--- a/engine/handlers/xml-rpc_handler.php
+++ b/engine/handlers/xml-rpc_handler.php
@@ -5,7 +5,7 @@
 	 * @package Elgg
 	 * @subpackage Core
 	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
-	 * @author Marcus Povey
+	 * @author Curverider Ltd
 	 * @copyright Curverider Ltd 2008
 	 * @link http://elgg.org/
 	 */
diff --git a/engine/lib/admin.php b/engine/lib/admin.php
index 3d72eb1c4..cd8d60799 100644
--- a/engine/lib/admin.php
+++ b/engine/lib/admin.php
@@ -6,7 +6,7 @@
 	 * @package Elgg
 	 * @subpackage Core
 	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
-	 * @author Marcus Povey 
+	 * @author Curverider Ltd 
 	 * @copyright Curverider Ltd 2008
 	 * @link http://elgg.org/
 	 */
diff --git a/engine/lib/annotations.php b/engine/lib/annotations.php
index 87c9d330f..9df54af2f 100644
--- a/engine/lib/annotations.php
+++ b/engine/lib/annotations.php
@@ -6,7 +6,7 @@
 	 * @package Elgg

 	 * @subpackage Core

 	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2

-	 * @author Marcus Povey <marcus@dushka.co.uk>

+	 * @author Curverider Ltd <info@elgg.com>

 	 * @copyright Curverider Ltd 2008

 	 * @link http://elgg.org/

 	 */

@@ -24,7 +24,7 @@
 	 * 

 	 * @package Elgg

 	 * @subpackage Core

-	 * @author Marcus Povey <marcus@dushka.co.uk>

+	 * @author Curverider Ltd <info@elgg.com>

 	 */

 	class ElggAnnotation extends ElggExtender

 	{

diff --git a/engine/lib/api.php b/engine/lib/api.php
index 0a3dbe8f5..0b006b352 100644
--- a/engine/lib/api.php
+++ b/engine/lib/api.php
@@ -6,7 +6,7 @@
 	 * @package Elgg
 	 * @subpackage Core
 	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
-	 * @author Marcus Povey <marcus@dushka.co.uk>
+	 * @author Curverider Ltd <info@elgg.com>
 	 * @copyright Curverider Ltd 2008
 	 * @link http://elgg.org/
 	 */
@@ -16,7 +16,7 @@
 	/**
 	 * GenericResult Result superclass.
 	 * 
-	 * @author Marcus Povey <marcus@dushka.co.uk>
+	 * @author Curverider Ltd <info@elgg.com>
 	 * @package Elgg
 	 * @subpackage Core
 	 */
@@ -112,7 +112,7 @@
 	 * SuccessResult
 	 * Generic success result class, extend if you want to do something special.
 	 * 
-	 * @author Marcus Povey <marcus@dushka.co.uk>
+	 * @author Curverider Ltd <info@elgg.com>
 	 * @package Elgg
 	 * @subpackage Core
 	 */
@@ -137,7 +137,7 @@
 	 * ErrorResult
 	 * The error result class.
 	 * 
-	 * @author Marcus Povey <marcus@dushka.co.uk>
+	 * @author Curverider Ltd <info@elgg.com>
 	 * @package Elgg
 	 * @subpackage Core
 	 */
diff --git a/engine/lib/cache.php b/engine/lib/cache.php
index 2fbbf3f04..6dd3b6192 100644
--- a/engine/lib/cache.php
+++ b/engine/lib/cache.php
@@ -6,7 +6,7 @@
 	 * @package Elgg
 	 * @subpackage API
 	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
-	 * @author Marcus Povey <marcus@dushka.co.uk>
+	 * @author Curverider Ltd <info@elgg.com>
 	 * @copyright Curverider Ltd 2008
 	 * @link http://elgg.org/
 	 */
@@ -15,7 +15,7 @@
 	 * ElggCache The elgg cache superclass.
 	 * This defines the interface for a cache (wherever that cache is stored).
 	 * 
-	 * @author Marcus Povey <marcus@dushka.co.uk>
+	 * @author Curverider Ltd <info@elgg.com>
 	 * @package Elgg
 	 * @subpackage API
 	 */
@@ -79,7 +79,7 @@
 	 * ElggFileCache
 	 * Store cached data in a file store.
 	 * 
-	 * @author Marcus Povey <marcus@dushka.co.uk>
+	 * @author Curverider Ltd <info@elgg.com>
 	 * @package Elgg
 	 * @subpackage API
 	 */
diff --git a/engine/lib/entities.php b/engine/lib/entities.php
index bf66a0132..d7cc502ed 100644
--- a/engine/lib/entities.php
+++ b/engine/lib/entities.php
@@ -6,7 +6,7 @@
 	 * @package Elgg
 	 * @subpackage Core
 	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
-	 * @author Marcus Povey <marcus@dushka.co.uk>
+	 * @author Curverider Ltd <info@elgg.com>
 	 * @copyright Curverider Ltd 2008
 	 * @link http://elgg.org/
 	 */
@@ -21,7 +21,7 @@
 	 * ElggEntity The elgg entity superclass
 	 * This class holds methods for accessing the main entities table.
 	 * 
-	 * @author Marcus Povey <marcus@dushka.co.uk>
+	 * @author Curverider Ltd <info@elgg.com>
 	 * @package Elgg
 	 * @subpackage Core
 	 */
diff --git a/engine/lib/exceptions.php b/engine/lib/exceptions.php
index de18f9b7e..23b24eec1 100644
--- a/engine/lib/exceptions.php
+++ b/engine/lib/exceptions.php
@@ -6,7 +6,7 @@
 	 * @package Elgg
 	 * @subpackage Exceptions
 	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
-	 * @author Marcus Povey <marcus@dushka.co.uk>
+	 * @author Curverider Ltd <info@elgg.com>
 	 * @copyright Curverider Ltd 2008
 	 * @link http://elgg.org/
 	 */
@@ -17,7 +17,7 @@
 	 * IOException 
 	 * An IO Exception, throw when an IO Exception occurs. Subclass for specific IO Exceptions.
 	 * 
-	 * @author Marcus Povey <marcus@dushka.co.uk>
+	 * @author Curverider Ltd <info@elgg.com>
 	 * @package Elgg
 	 * @subpackage Exceptions
 	 */
@@ -27,7 +27,7 @@
 	 * ClassException 
 	 * A class Exception, throw when there is a class error.
 	 * 
-	 * @author Marcus Povey <marcus@dushka.co.uk>
+	 * @author Curverider Ltd <info@elgg.com>
 	 * @package Elgg
 	 * @subpackage Exceptions
 	 */
@@ -37,7 +37,7 @@
 	 * ConfigurationException 
 	 * There is a configuration error
 	 * 
-	 * @author Marcus Povey <marcus@dushka.co.uk>
+	 * @author Curverider Ltd <info@elgg.com>
 	 * @package Elgg
 	 * @subpackage Exceptions
 	 */
@@ -47,7 +47,7 @@
 	 * SecurityException 
 	 * An Security Exception, throw when a Security Exception occurs. Subclass for specific Security Execeptions (access problems etc)
 	 * 
-	 * @author Marcus Povey <marcus@dushka.co.uk>
+	 * @author Curverider Ltd <info@elgg.com>
 	 * @package Elgg
 	 * @subpackage Exceptions
 	 */
@@ -57,7 +57,7 @@
 	 * ClassNotFoundException 
 	 * An database exception, throw when a database exception happens, subclass if more detail is needed.
 	 * 
-	 * @author Marcus Povey <marcus@dushka.co.uk>
+	 * @author Curverider Ltd <info@elgg.com>
 	 * @package Elgg
 	 * @subpackage Exceptions
 	 */
@@ -67,7 +67,7 @@
 	 * APIException
 	 * The API Exception class, thrown by the API layer when an API call has an issue.
 	 * 
-	 * @author Marcus Povey <marcus@dushka.co.uk>
+	 * @author Curverider Ltd <info@elgg.com>
 	 * @package Elgg
 	 * @subpackage Exceptions
 	 */
@@ -77,7 +77,7 @@
 	 * CallException
 	 * An exception thrown when there is a problem calling something.
 	 * 
-	 * @author Marcus Povey <marcus@dushka.co.uk>
+	 * @author Curverider Ltd <info@elgg.com>
 	 * @package Elgg
 	 * @subpackage Exceptions
 	 */
@@ -87,7 +87,7 @@
 	 * Data format exception
 	 * An exception thrown when there is a problem in the format of some data.
 	 * 
-	 * @author Marcus Povey <marcus@dushka.co.uk>
+	 * @author Curverider Ltd <info@elgg.com>
 	 * @package Elgg
 	 * @subpackage Exceptions
 	 */
@@ -99,7 +99,7 @@
 	 * InvalidClassException 
 	 * An invalid class Exception, throw when a class is invalid.
 	 * 
-	 * @author Marcus Povey <marcus@dushka.co.uk>
+	 * @author Curverider Ltd <info@elgg.com>
 	 * @package Elgg
 	 * @subpackage Exceptions
 	 */
@@ -109,7 +109,7 @@
 	 * ClassNotFoundException 
 	 * An Class not found Exception, throw when an class can not be found occurs.
 	 * 
-	 * @author Marcus Povey <marcus@dushka.co.uk>
+	 * @author Curverider Ltd <info@elgg.com>
 	 * @package Elgg
 	 * @subpackage Exceptions
 	 */
@@ -121,7 +121,7 @@
 	 * InstallationException
 	 * Thrown when there is a major problem with the installation.
 	 * 
-	 * @author Marcus Povey <marcus@dushka.co.uk>
+	 * @author Curverider Ltd <info@elgg.com>
 	 * @package Elgg
 	 * @subpackage Exceptions
 	 */
@@ -134,7 +134,7 @@
 	 * Thrown when a method or function has not been implemented, primarily used in development... you should
 	 * not see these!
 	 * 
-	 * @author Marcus Povey <marcus@dushka.co.uk>
+	 * @author Curverider Ltd <info@elgg.com>
 	 * @package Elgg
 	 * @subpackage Exceptions
 	 */
@@ -144,7 +144,7 @@
 	 * InvalidParameterException
 	 * A parameter is invalid.
 	 * 
-	 * @author Marcus Povey <marcus@dushka.co.uk>
+	 * @author Curverider Ltd <info@elgg.com>
 	 * @package Elgg
 	 * @subpackage Exceptions
 	 */
diff --git a/engine/lib/export.php b/engine/lib/export.php
index 5560a9f71..fe9d2b2da 100644
--- a/engine/lib/export.php
+++ b/engine/lib/export.php
@@ -5,7 +5,7 @@
 	 * @package Elgg
 	 * @subpackage Core
 	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
-	 * @author Marcus Povey
+	 * @author Curverider Ltd
 	 * @copyright Curverider Ltd 2008
 	 * @link http://elgg.org/
 	 */
@@ -15,7 +15,7 @@
 	 * 
 	 * @package Elgg
 	 * @subpackage Core
-	 * @author Marcus Povey
+	 * @author Curverider Ltd
 	 */
 	interface Exportable
 	{
@@ -29,7 +29,7 @@
 
 	/**
 	 * Define an interface for all ODD importable objects.
-	 * @author Marcus Povey
+	 * @author Curverider Ltd
 	 */
 	interface Importable
 	{
diff --git a/engine/lib/extender.php b/engine/lib/extender.php
index e444a4d55..f682053c0 100644
--- a/engine/lib/extender.php
+++ b/engine/lib/extender.php
@@ -6,7 +6,7 @@
 	 * @package Elgg
 	 * @subpackage Core
 	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
-	 * @author Marcus Povey
+	 * @author Curverider Ltd
 	 * @copyright Curverider Ltd 2008
 	 * @link http://elgg.org/
 	 */
@@ -14,7 +14,7 @@
 	/**
 	 * ElggExtender 
 	 * 
-	 * @author Marcus Povey
+	 * @author Curverider Ltd
 	 * @package Elgg
 	 * @subpackage Core
 	 */
diff --git a/engine/lib/filestore.php b/engine/lib/filestore.php
index e0fe07a98..e959d6c9e 100644
--- a/engine/lib/filestore.php
+++ b/engine/lib/filestore.php
@@ -7,7 +7,7 @@
 	 * @package Elgg
 	 * @subpackage API
 	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
-	 * @author Marcus Povey
+	 * @author Curverider Ltd
 	 * @copyright Curverider Ltd 2008
 	 * @link http://elgg.org/
 	 */
@@ -17,7 +17,7 @@
 	/**
 	 * @class ElggFilestore
 	 * This class defines the interface for all elgg data repositories.
-	 * @author Marcus Povey
+	 * @author Curverider Ltd
 	 */
 	abstract class ElggFilestore
 	{
@@ -127,7 +127,7 @@
 	/**
 	 * @class ElggDiskFilestore
 	 * This class uses disk storage to save data.
-	 * @author Marcus Povey
+	 * @author Curverider Ltd
 	 */
 	class ElggDiskFilestore extends ElggFilestore
 	{
@@ -312,7 +312,7 @@
 	 * 		there are many occasions where you may want access to file data on datastores using the ElggFile interface
 	 * 		but do not want to create an Entity reference to it in the system (temporary files for example).
 	 * 
-	 * @author Marcus Povey
+	 * @author Curverider Ltd
 	 */
 	class ElggFile extends ElggObject
 	{
diff --git a/engine/lib/group.php b/engine/lib/group.php
index 20d98fdbf..3d5c4bad8 100644
--- a/engine/lib/group.php
+++ b/engine/lib/group.php
@@ -7,14 +7,14 @@
 	 * @package Elgg
 	 * @subpackage Core
 	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
-	 * @author Marcus Povey
+	 * @author Curverider Ltd
 	 * @copyright Curverider Ltd 2008
 	 * @link http://elgg.org/
 	 */
 
 	/**
 	 * @class ElggGroup Class representing a container for other elgg entities.
-	 * @author Marcus Povey
+	 * @author Curverider Ltd
 	 */
 	class ElggGroup extends ElggEntity

 		implements Friendable
diff --git a/engine/lib/input.php b/engine/lib/input.php
index e200f8866..700b3e7f1 100644
--- a/engine/lib/input.php
+++ b/engine/lib/input.php
@@ -6,7 +6,7 @@
 	 * @package Elgg

 	 * @subpackage Core

 	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2

-	 * @author Marcus Povey <marcus@dushka.co.uk>

+	 * @author Curverider Ltd <info@elgg.com>

 	 * @copyright Curverider Ltd 2008

 	 * @link http://elgg.org/

 	 */

diff --git a/engine/lib/metadata.php b/engine/lib/metadata.php
index 0bfbebd70..f8089f721 100644
--- a/engine/lib/metadata.php
+++ b/engine/lib/metadata.php
@@ -6,7 +6,7 @@
 	 * @package Elgg
 	 * @subpackage Core
 	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
-	 * @author Marcus Povey <marcus@dushka.co.uk>
+	 * @author Curverider Ltd <info@elgg.com>
 	 * @copyright Curverider Ltd 2008
 	 * @link http://elgg.org/
 	 */
@@ -15,7 +15,7 @@
 	 * ElggMetadata
 	 * This class describes metadata that can be attached to ElggEntities.
 	 * 
-	 * @author Marcus Povey <marcus@dushka.co.uk>
+	 * @author Curverider Ltd <info@elgg.com>
 	 * @package Elgg
 	 * @subpackage Core
 	 */
diff --git a/engine/lib/metastrings.php b/engine/lib/metastrings.php
index fe8cb5bcf..b6e3b431d 100644
--- a/engine/lib/metastrings.php
+++ b/engine/lib/metastrings.php
@@ -6,7 +6,7 @@
 	 * @package Elgg
 	 * @subpackage Core
 	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
-	 * @author Marcus Povey <marcus@dushka.co.uk>
+	 * @author Curverider Ltd <info@elgg.com>
 	 * @copyright Curverider Ltd 2008
 	 * @link http://elgg.org/
 	 */
diff --git a/engine/lib/notification.php b/engine/lib/notification.php
index 838f776a2..c483f1ed8 100644
--- a/engine/lib/notification.php
+++ b/engine/lib/notification.php
@@ -16,7 +16,7 @@
 	 * @package Elgg
 	 * @subpackage API
 	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
-	 * @author Marcus Povey
+	 * @author Curverider Ltd
 	 * @copyright Curverider Ltd 2008
 	 * @link http://elgg.org/
 	 */
@@ -193,7 +193,7 @@
 	
 	/**
 	 * Notification exception.
-	 * @author Marcus Povey
+	 * @author Curverider Ltd
 	 */
 	class NotificationException extends Exception {}
 
diff --git a/engine/lib/opendd.php b/engine/lib/opendd.php
index 5f1a3a147..c370b223c 100644
--- a/engine/lib/opendd.php
+++ b/engine/lib/opendd.php
@@ -5,7 +5,7 @@
 	 * @package Elgg
 	 * @subpackage Core
 	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
-	 * @author Marcus Povey
+	 * @author Curverider Ltd
 	 * @version 0.4
 	 * @copyright Curverider Ltd 2008
 	 * @link http://elgg.org/
@@ -16,7 +16,7 @@
 	/**
 	 * @class ODDDocument ODD Document container.
 	 * This class is used during import and export to construct.
-	 * @author Marcus Povey
+	 * @author Curverider Ltd
 	 */
 	class ODDDocument implements Iterator
 	{
@@ -142,7 +142,7 @@
 	 * Open Data Definition (ODD) superclass.
 	 * @package Elgg
 	 * @subpackage Core
-	 * @author Marcus Povey
+	 * @author Curverider Ltd
 	 */
 	abstract class ODD
 	{		
@@ -225,7 +225,7 @@
 	 * ODD Entity class.
 	 * @package Elgg
 	 * @subpackage Core
-	 * @author Marcus Povey
+	 * @author Curverider Ltd
 	 */
 	class ODDEntity extends ODD
 	{
@@ -245,7 +245,7 @@
 	 * ODD Metadata class.
 	 * @package Elgg
 	 * @subpackage Core
-	 * @author Marcus Povey
+	 * @author Curverider Ltd
 	 */
 	class ODDMetaData extends ODD
 	{
@@ -268,7 +268,7 @@
 	 * ODD Relationship class.
 	 * @package Elgg
 	 * @subpackage Core
-	 * @author Marcus Povey
+	 * @author Curverider Ltd
 	 */
 	class ODDRelationship extends ODD
 	{
diff --git a/engine/lib/pam.php b/engine/lib/pam.php
index 1faa0014e..4bc9b1cc2 100644
--- a/engine/lib/pam.php
+++ b/engine/lib/pam.php
@@ -7,7 +7,7 @@
 	 * @package Elgg

 	 * @subpackage Core

 	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2

-	 * @author Marcus Povey

+	 * @author Curverider Ltd

 	 * @copyright Curverider Ltd 2008

 	 * @link http://elgg.org/

 	 */

diff --git a/engine/lib/ping.php b/engine/lib/ping.php
index fef079993..ed119b50a 100644
--- a/engine/lib/ping.php
+++ b/engine/lib/ping.php
@@ -5,7 +5,7 @@
 	 * @package Elgg
 	 * @subpackage Core
 	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
-	 * @author Marcus Poveysend_api_get_call
+	 * @author Curverider Ltdsend_api_get_call
 	 * @copyright Curverider Ltd 2008
 	 * @link http://elgg.org/
 	 */
diff --git a/engine/lib/plugins.php b/engine/lib/plugins.php
index b22dec7be..c53cac785 100644
--- a/engine/lib/plugins.php
+++ b/engine/lib/plugins.php
@@ -26,7 +26,7 @@
 		/**
 		 * @class ElggPlugin Object representing a plugin's settings for a given site.
 		 * This class is currently a stub, allowing a plugin to saving settings in an object's metadata for each site.
-		 * @author Marcus Povey
+		 * @author Curverider Ltd
 		 */
 		class ElggPlugin extends ElggObject
 		{
@@ -130,7 +130,7 @@
 		 * Example file:
 		 * 
 		 * <plugin_manifest>
-		 * 	<field key="author" value="Marcus Povey" />
+		 * 	<field key="author" value="Curverider Ltd" />
 		 *  <field key="version" value="1.0" />
 		 * 	<field key="description" value="My plugin description, keep it short" />
 		 *  <field key="website" value="http://www.elgg.org/" />
diff --git a/engine/lib/query.php b/engine/lib/query.php
index 61f36dc1e..c74628b91 100644
--- a/engine/lib/query.php
+++ b/engine/lib/query.php
@@ -6,7 +6,7 @@
 	 * @package Elgg
 	 * @subpackage Core
 	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
-	 * @author Marcus Povey
+	 * @author Curverider Ltd
 	 * @copyright Curverider Ltd 2008
 	 * @link http://elgg.org/
 	 */
@@ -15,7 +15,7 @@
 	/**
 	 * @class QueryComponent Query component superclass.
 	 * Component of a query.
-	 * @author Marcus Povey
+	 * @author Curverider Ltd
 	 * @see Query
 	 */
 	abstract class QueryComponent 
@@ -57,7 +57,7 @@
 	/**
 	 * @class SelectFieldQueryComponent Class representing a select field.
 	 * This class represents a select field component.
-	 * @author Marcus Povey
+	 * @author Curverider Ltd
 	 * @see Query
 	 */
 	class SelectFieldQueryComponent extends QueryComponent 
@@ -85,7 +85,7 @@
 	/**
 	 * @class LimitOffsetQueryComponent
 	 * Limit and offset clauses of a query.
-	 * @author Marcus Povey
+	 * @author Curverider Ltd
 	 * @see Query
 	 */
 	class LimitOffsetQueryComponent extends QueryComponent
@@ -111,7 +111,7 @@
 	/**
 	 * @class OrderQueryComponent
 	 * Order the query results.
-	 * @author Marcus Povey
+	 * @author Curverider Ltd
 	 * @see Query
 	 */
 	class OrderQueryComponent extends QueryComponent
@@ -134,7 +134,7 @@
 	/**
 	 * @class TableQueryComponent
 	 * List of tables to select from or insert into.
-	 * @author Marcus Povey
+	 * @author Curverider Ltd
 	 * @see Query
 	 */
 	class TableQueryComponent extends QueryComponent
@@ -155,7 +155,7 @@
 	/**
 	 * @class AccessControlQueryComponent
 	 * Access control component.
-	 * @author Marcus Povey
+	 * @author Curverider Ltd
 	 * @see Query
 	 */
 	class AccessControlQueryComponent extends QueryComponent
@@ -189,7 +189,7 @@
 	/**
 	 * @class JoinQueryComponent Join query.
 	 * Represents a join query.
-	 * @author Marcus Povey
+	 * @author Curverider Ltd
 	 * @see Query
 	 */
 	class JoinQueryComponent extends QueryComponent
@@ -222,7 +222,7 @@
 	/**
 	 * @class SetQueryComponent Set query.
 	 * Represents an update set query.
-	 * @author Marcus Povey
+	 * @author Curverider Ltd
 	 * @see Query
 	 */
 	class SetQueryComponent extends QueryComponent
@@ -255,7 +255,7 @@
 	/**
 	 * @class WhereQueryComponent
 	 * A component of a where query.
-	 * @author Marcus Povey
+	 * @author Curverider Ltd
 	 * @see Query
 	 */
 	class WhereQueryComponent extends QueryComponent
@@ -299,7 +299,7 @@
 	/**
 	 * @class WhereStaticQueryComponent
 	 * A component of a where query where there is no right hand table, rather a static value.
-	 * @author Marcus Povey
+	 * @author Curverider Ltd
 	 * @see Query
 	 */
 	class WhereStaticQueryComponent extends WhereQueryComponent
@@ -339,7 +339,7 @@
 	/**
 	 * @class WhereSetQueryComponent
 	 * A where query that may contain other where queries (in brackets).
-	 * @author Marcus Povey
+	 * @author Curverider Ltd
 	 * @see Query
 	 */
 	class WhereSetQueryComponent extends WhereQueryComponent
@@ -380,7 +380,7 @@
 	/**
 	 * @class QueryTypeQueryComponent
 	 * What type of query is this?
-	 * @author Marcus Povey
+	 * @author Curverider Ltd
 	 * @see Query
 	 */
 	abstract class QueryTypeQueryComponent extends QueryComponent 
@@ -394,7 +394,7 @@
 	/**
 	 * @class SelectQueryTypeQueryComponent
 	 * A select query.
-	 * @author Marcus Povey
+	 * @author Curverider Ltd
 	 * @see Query
 	 */
 	class SelectQueryTypeQueryComponent extends QueryTypeQueryComponent 
@@ -408,7 +408,7 @@
 	/**
 	 * @class InsertQueryTypeQueryComponent
 	 * An insert query.
-	 * @author Marcus Povey
+	 * @author Curverider Ltd
 	 * @see Query
 	 */
 	class InsertQueryTypeQueryComponent extends QueryTypeQueryComponent 
@@ -422,7 +422,7 @@
 	/**
 	 * @class DeleteQueryTypeQueryComponent
 	 * A delete query.
-	 * @author Marcus Povey
+	 * @author Curverider Ltd
 	 * @see Query
 	 */
 	class DeleteQueryTypeQueryComponent extends QueryTypeQueryComponent 
@@ -436,7 +436,7 @@
 	/**
 	 * @class UpdateQueryTypeQueryComponent
 	 * An update query.
-	 * @author Marcus Povey
+	 * @author Curverider Ltd
 	 * @see Query
 	 */
 	class UpdateQueryTypeQueryComponent extends QueryTypeQueryComponent 
@@ -507,7 +507,7 @@
 	 * 		get_data($query);
 	 * </blockquote>
 	 * 
-	 * @author Marcus Povey
+	 * @author Curverider Ltd
 	 */
 	class Query
 	{
@@ -741,7 +741,7 @@
 	 * The constructor for this class sets a number of defaults, for example sets default access controls
 	 * and a limit and offset - to change this then set it manually.
 	 * 
-	 * @author Marcus Povey
+	 * @author Curverider Ltd
 	 * @see Query
 	 */
 	class SimpleQuery extends Query
diff --git a/engine/lib/relationships.php b/engine/lib/relationships.php
index ffb2d1ee4..b4b085a80 100644
--- a/engine/lib/relationships.php
+++ b/engine/lib/relationships.php
@@ -6,7 +6,7 @@
 	 * @package Elgg
 	 * @subpackage Core
 	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
-	 * @author Marcus Povey <marcus@dushka.co.uk>
+	 * @author Curverider Ltd <info@elgg.com>
 	 * @copyright Curverider Ltd 2008
 	 * @link http://elgg.org/
 	 */
@@ -14,7 +14,7 @@
 	/**
 	 * Relationship class.
 	 * 
-	 * @author Marcus Povey
+	 * @author Curverider Ltd
 	 * @package Elgg
 	 * @subpackage Core
 	 */
diff --git a/engine/lib/river.php b/engine/lib/river.php
index 3b69efd1c..39be91d0d 100644
--- a/engine/lib/river.php
+++ b/engine/lib/river.php
@@ -6,7 +6,7 @@
 	 * @package Elgg
 	 * @subpackage Core
 	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
-	 * @author Marcus Povey
+	 * @author Curverider Ltd
 	 * @copyright Curverider Ltd 2008
 	 * @link http://elgg.org/
 	 */
@@ -19,7 +19,7 @@
 	 *  - The event performed
 	 *  - Any related objects
 	 * 
-	 * @author Marcus Povey
+	 * @author Curverider Ltd
 	 */
 	class ElggRiverStatement
 	{
diff --git a/engine/lib/sites.php b/engine/lib/sites.php
index 9ad1a7621..16e4c6614 100644
--- a/engine/lib/sites.php
+++ b/engine/lib/sites.php
@@ -7,7 +7,7 @@
 	 * @package Elgg

 	 * @subpackage Core

 	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2

-	 * @author Marcus Povey <marcus@dushka.co.uk>

+	 * @author Curverider Ltd <info@elgg.com>

 	 * @copyright Curverider Ltd 2008

 	 * @link http://elgg.org/

 	 */

@@ -15,7 +15,7 @@
 	/**
 	 * ElggSite
 	 * Representation of a "site" in the system.
-	 * @author Marcus Povey <marcus@dushka.co.uk>
+	 * @author Curverider Ltd <info@elgg.com>
 	 * @package Elgg
 	 * @subpackage Core
 	 */
diff --git a/engine/lib/statistics.php b/engine/lib/statistics.php
index 75c14b843..89c6d9a09 100644
--- a/engine/lib/statistics.php
+++ b/engine/lib/statistics.php
@@ -8,7 +8,7 @@
 	 * @package Elgg
 	 * @subpackage Core
 	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
-	 * @author Marcus Povey
+	 * @author Curverider Ltd
 	 * @copyright Curverider Ltd 2008
 	 * @link http://elgg.org/
 	 */
diff --git a/engine/lib/system_log.php b/engine/lib/system_log.php
index 4452e4dc8..3949fc1c8 100644
--- a/engine/lib/system_log.php
+++ b/engine/lib/system_log.php
@@ -6,7 +6,7 @@
 	 * @package Elgg
 	 * @subpackage Core
 	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
-	 * @author Marcus Povey
+	 * @author Curverider Ltd
 	 * @copyright Curverider Ltd 2008
 	 * @link http://elgg.org/
 	 */
@@ -20,7 +20,7 @@
 	 * 
 	 * To have events involving your object to be logged simply implement this interface.
 	 * 
-	 * @author Marcus Povey
+	 * @author Curverider Ltd
 	 */
 	interface Loggable 
 	{
diff --git a/engine/lib/tags.php b/engine/lib/tags.php
index fbb533c4a..30aa9f78c 100644
--- a/engine/lib/tags.php
+++ b/engine/lib/tags.php
@@ -6,7 +6,7 @@
 	 * @package Elgg
 	 * @subpackage Core
 	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
-	 * @author Marcus Povey <marcus@dushka.co.uk>
+	 * @author Curverider Ltd <info@elgg.com>
 	 * @copyright Curverider Ltd 2008
 	 * @link http://elgg.org/
 	 */
diff --git a/engine/lib/usersettings.php b/engine/lib/usersettings.php
index 433d41fb7..647cbdaed 100644
--- a/engine/lib/usersettings.php
+++ b/engine/lib/usersettings.php
@@ -6,7 +6,7 @@
 	 * @package Elgg
 	 * @subpackage Core
 	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
-	 * @author Marcus Povey 
+	 * @author Curverider Ltd 
 	 * @copyright Curverider Ltd 2008
 	 * @link http://elgg.org/
 	 */
diff --git a/engine/lib/xml-rpc.php b/engine/lib/xml-rpc.php
index e35c966b6..9a6fdf268 100644
--- a/engine/lib/xml-rpc.php
+++ b/engine/lib/xml-rpc.php
@@ -6,7 +6,7 @@
 	 * @package Elgg
 	 * @subpackage Core
 	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
-	 * @author Marcus Povey
+	 * @author Curverider Ltd
 	 * @copyright Curverider Ltd 2008
 	 * @link http://elgg.org/
 	 */
@@ -16,7 +16,7 @@
 	/**
 	 * @class XMLRPCCall
 	 * This class represents 
-	 * @author Marcus Povey
+	 * @author Curverider Ltd
 	 */
 	class XMLRPCCall
 	{
@@ -77,7 +77,7 @@
 
 	/**
 	 * @class XMLRPCParameter Superclass for all RPC parameters.
-	 * @author Marcus Povey
+	 * @author Curverider Ltd
 	 */
 	abstract class XMLRPCParameter
 	{
@@ -89,7 +89,7 @@
 	
 	/**
 	 * @class XMLRPCIntParameter An Integer.
-	 * @author Marcus Povey
+	 * @author Curverider Ltd
 	 */
 	class XMLRPCIntParameter extends XMLRPCParameter
 	{
@@ -108,7 +108,7 @@
 	
 	/**
 	 * @class XMLRPCBoolParameter A boolean.
-	 * @author Marcus Povey
+	 * @author Curverider Ltd
 	 */
 	class XMLRPCBoolParameter extends XMLRPCParameter
 	{
@@ -128,7 +128,7 @@
 	
 	/**
 	 * @class XMLRPCStringParameter A string.
-	 * @author Marcus Povey
+	 * @author Curverider Ltd
 	 */
 	class XMLRPCStringParameter extends XMLRPCParameter
 	{
@@ -148,7 +148,7 @@
 	
 	/**
 	 * @class XMLRPCDoubleParameter A double precision signed floating point number.
-	 * @author Marcus Povey
+	 * @author Curverider Ltd
 	 */
 	class XMLRPCDoubleParameter extends XMLRPCParameter
 	{
@@ -167,7 +167,7 @@
 	
 	/**
 	 * @class XMLRPCDateParameter An ISO8601 data and time.
-	 * @author Marcus Povey
+	 * @author Curverider Ltd
 	 */
 	class XMLRPCDateParameter extends XMLRPCParameter
 	{
@@ -194,7 +194,7 @@
 	
 	/**
 	 * @class XMLRPCBase64Parameter A base 64 encoded blob of binary.
-	 * @author Marcus Povey
+	 * @author Curverider Ltd
 	 */
 	class XMLRPCBase64Parameter extends XMLRPCParameter
 	{
@@ -218,7 +218,7 @@
 	
 	/**
 	 * @class XMLRPCStructParameter A structure containing other XMLRPCParameter objects.
-	 * @author Marcus Povey
+	 * @author Curverider Ltd
 	 */
 	class XMLRPCStructParameter extends XMLRPCParameter
 	{
@@ -270,7 +270,7 @@ END;
 	
 	/**
 	 * @class XMLRPCArrayParameter An array containing other XMLRPCParameter objects.
-	 * @author Marcus Povey
+	 * @author Curverider Ltd
 	 */
 	class XMLRPCArrayParameter extends XMLRPCParameter
 	{
@@ -323,7 +323,7 @@ END;
 	
 	/**
 	 * @class XMLRPCResponse XML-RPC Response. 
-	 * @author Marcus Povey
+	 * @author Curverider Ltd
 	 */
 	abstract class XMLRPCResponse
 	{
@@ -351,7 +351,7 @@ END;
 
 	/**
 	 * @class XMLRPCSuccessResponse
-	 * @author Marcus Povey
+	 * @author Curverider Ltd
 	 */
 	class XMLRPCSuccessResponse extends XMLRPCResponse
 	{
@@ -376,7 +376,7 @@ END;
 
 	/**
 	 * @class XMLRPCErrorResponse
-	 * @author Marcus Povey
+	 * @author Curverider Ltd
 	 */
 	class XMLRPCErrorResponse extends XMLRPCResponse
 	{		
diff --git a/engine/lib/xml.php b/engine/lib/xml.php
index 30f667f90..a2d460a76 100644
--- a/engine/lib/xml.php
+++ b/engine/lib/xml.php
@@ -6,7 +6,7 @@
 	 * @package Elgg
 	 * @subpackage Core
 	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
-	 * @author Marcus Povey
+	 * @author Curverider Ltd
 	 * @copyright Curverider Ltd 2008
 	 * @link http://elgg.org/
 	 */