diff --git a/lib/Doctrine/Access.php b/lib/Doctrine/Access.php
index 91ca06d9e..9bd8c2b9d 100644
--- a/lib/Doctrine/Access.php
+++ b/lib/Doctrine/Access.php
@@ -22,12 +22,7 @@
 /**
  * Provides array access and property overload interface for Doctrine subclasses.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7490 $
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
@@ -36,8 +31,7 @@ abstract class Doctrine_Access extends Doctrine_Locator_Injectable implements Ar
     /**
      * Set an entire aray to the data.
      *
-     * @param array $array An array of key => value pairs
-     *
+     * @param  array           $array An array of key => value pairs
      * @return Doctrine_Access
      */
     public function setArray(array $array)
@@ -72,9 +66,8 @@ public function __get($name)
     /**
      * Check if key exists in data.
      *
-     * @param string $name
-     *
-     * @return bool whether or not this object contains $name
+     * @param  string $name
+     * @return bool   whether or not this object contains $name
      */
     public function __isset($name)
     {
@@ -133,9 +126,8 @@ public function offsetUnset($offset)
     /**
      * Remove the element with the specified offset.
      *
-     * @param mixed $offset The offset to remove
-     *
-     * @return bool True if removed otherwise false
+     * @param  mixed $offset The offset to remove
+     * @return bool  True if removed otherwise false
      */
     public function remove($offset)
     {
@@ -166,9 +158,8 @@ public function set($offset, $value)
     /**
      * Check if the specified offset exists.
      *
-     * @param mixed $offset The offset to check
-     *
-     * @return bool True if exists otherwise false
+     * @param  mixed $offset The offset to check
+     * @return bool  True if exists otherwise false
      */
     public function contains($offset)
     {
diff --git a/lib/Doctrine/Adapter/Exception.php b/lib/Doctrine/Adapter/Exception.php
index f13ef4860..cb22c7129 100644
--- a/lib/Doctrine/Adapter/Exception.php
+++ b/lib/Doctrine/Adapter/Exception.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Adapter exception class.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
diff --git a/lib/Doctrine/Adapter/Interface.php b/lib/Doctrine/Adapter/Interface.php
index b79c46701..3e0101d4e 100644
--- a/lib/Doctrine/Adapter/Interface.php
+++ b/lib/Doctrine/Adapter/Interface.php
@@ -23,12 +23,8 @@
  * This adapter interface should be implemented by all custom adapters.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7490 $
  */
 interface Doctrine_Adapter_Interface
 {
diff --git a/lib/Doctrine/Adapter/Mock.php b/lib/Doctrine/Adapter/Mock.php
index c1640d9fb..74edcb8fd 100644
--- a/lib/Doctrine/Adapter/Mock.php
+++ b/lib/Doctrine/Adapter/Mock.php
@@ -23,12 +23,8 @@
  * Doctrine mock connection adapter. This class is used for special testing purposes.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7490 $
  */
 class Doctrine_Adapter_Mock implements Doctrine_Adapter_Interface, Countable
 {
@@ -109,8 +105,7 @@ public function forceException($name, $message = '', $code = 0)
     /**
      * Prepare a query statement.
      *
-     * @param string $query Query to prepare
-     *
+     * @param  string                          $query Query to prepare
      * @return Doctrine_Adapter_Statement_Mock $mock Mock prepared statement
      */
     public function prepare($query)
@@ -134,8 +129,7 @@ public function addQuery($query)
     /**
      * Fake the execution of query and add it to the stack of executed queries.
      *
-     * @param string $query
-     *
+     * @param  string                          $query
      * @return Doctrine_Adapter_Statement_Mock $stmt
      */
     public function query($query)
@@ -171,8 +165,7 @@ public function getAll()
     /**
      * Quote a value for the dbms.
      *
-     * @param string $input
-     *
+     * @param  string $input
      * @return string $quoted
      */
     public function quote($input)
diff --git a/lib/Doctrine/Adapter/Oracle.php b/lib/Doctrine/Adapter/Oracle.php
index 8f4e97c21..75a930df7 100644
--- a/lib/Doctrine/Adapter/Oracle.php
+++ b/lib/Doctrine/Adapter/Oracle.php
@@ -25,12 +25,8 @@
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  * @author      vadik56
  * @author      Miloslav Kmet <adrive-nospam@hip-hop.sk>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  */
 class Doctrine_Adapter_Oracle implements Doctrine_Adapter_Interface
 {
@@ -142,8 +138,7 @@ public function __construct($config = array(), $username = null, $password = nul
     /**
      * Prepare a query statement.
      *
-     * @param string $query Query to prepare
-     *
+     * @param  string                            $query Query to prepare
      * @return Doctrine_Adapter_Statement_Oracle $stmt prepared statement
      */
     public function prepare($query)
@@ -154,8 +149,7 @@ public function prepare($query)
     /**
      * Execute query and return results as statement object.
      *
-     * @param string $query
-     *
+     * @param  string                            $query
      * @return Doctrine_Adapter_Statement_Oracle $stmt
      */
     public function query($query)
@@ -169,8 +163,7 @@ public function query($query)
     /**
      * Quote a value for the dbms.
      *
-     * @param string $input
-     *
+     * @param  string $input
      * @return string $quoted
      */
     public function quote($input)
@@ -234,10 +227,9 @@ public function rollBack()
     /**
      * Set connection attribute.
      *
-     * @param int   $attribute
-     * @param mixed $value     the value of given attribute
-     *
-     * @return bool returns TRUE on success or FALSE on failure
+     * @param  int   $attribute
+     * @param  mixed $value     the value of given attribute
+     * @return bool  returns TRUE on success or FALSE on failure
      */
     public function setAttribute($attribute, $value)
     {
diff --git a/lib/Doctrine/Adapter/Statement.php b/lib/Doctrine/Adapter/Statement.php
index e4197c678..a4183c830 100644
--- a/lib/Doctrine/Adapter/Statement.php
+++ b/lib/Doctrine/Adapter/Statement.php
@@ -23,12 +23,8 @@
  * Doctrine_Adapter_Statement.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7490 $
  */
 abstract class Doctrine_Adapter_Statement
 {
diff --git a/lib/Doctrine/Adapter/Statement/Interface.php b/lib/Doctrine/Adapter/Statement/Interface.php
index 0835b86e2..664758e0b 100644
--- a/lib/Doctrine/Adapter/Statement/Interface.php
+++ b/lib/Doctrine/Adapter/Statement/Interface.php
@@ -23,25 +23,20 @@
  * Interface for Doctrine adapter statements.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7490 $
  */
 interface Doctrine_Adapter_Statement_Interface
 {
     /**
      * Bind a column to a PHP variable.
      *
-     * @param mixed  $column Number of the column (1-indexed) or name of the column in the result set.
-     *                       If using the column name, be aware that the name should match
-     *                       the case of the column, as returned by the driver.
-     * @param string $param  name of the PHP variable to which the column will be bound
-     * @param int    $type   data type of the parameter, specified by the Doctrine_Core::PARAM_* constants
-     *
-     * @return bool Returns TRUE on success or FALSE on failure
+     * @param  mixed  $column Number of the column (1-indexed) or name of the column in the result set.
+     *                        If using the column name, be aware that the name should match
+     *                        the case of the column, as returned by the driver.
+     * @param  string $param  name of the PHP variable to which the column will be bound
+     * @param  int    $type   data type of the parameter, specified by the Doctrine_Core::PARAM_* constants
+     * @return bool   Returns TRUE on success or FALSE on failure
      */
     public function bindColumn($column, $param, $type = null);
 
@@ -49,13 +44,12 @@ public function bindColumn($column, $param, $type = null);
      * Binds a value to a corresponding named or question mark
      * placeholder in the SQL statement that was use to prepare the statement.
      *
-     * @param mixed $param Parameter identifier. For a prepared statement using named placeholders,
-     *                     this will be a parameter name of the form :name. For a prepared statement
-     *                     using question mark placeholders, this will be the 1-indexed position of the parameter
-     * @param mixed $value the value to bind to the parameter
-     * @param int   $type  explicit data type for the parameter using the Doctrine_Core::PARAM_* constants
-     *
-     * @return bool returns TRUE on success or FALSE on failure
+     * @param  mixed $param Parameter identifier. For a prepared statement using named placeholders,
+     *                      this will be a parameter name of the form :name. For a prepared statement
+     *                      using question mark placeholders, this will be the 1-indexed position of the parameter
+     * @param  mixed $value the value to bind to the parameter
+     * @param  int   $type  explicit data type for the parameter using the Doctrine_Core::PARAM_* constants
+     * @return bool  returns TRUE on success or FALSE on failure
      */
     public function bindValue($param, $value, $type = null);
 
@@ -70,14 +64,13 @@ public function bindValue($param, $value, $type = null);
      * of stored procedures that return data as output parameters, and some also as input/output
      * parameters that both send in data and are updated to receive it.
      *
-     * @param mixed $variable name of the PHP variable to bind to the SQL statement parameter
-     * @param int   $type     Explicit data type for the parameter using the Doctrine_Core::PARAM_* constants. To return
-     *                        an INOUT parameter from a stored procedure, use the bitwise OR operator to set the
-     *                        Doctrine_Core::PARAM_INPUT_OUTPUT bits for the data_type parameter.
-     * @param int   $length   Length of the data type. To indicate that a parameter is an OUT parameter
-     *                        from a stored procedure, you must explicitly set the length.
-     *
-     * @return bool returns TRUE on success or FALSE on failure
+     * @param  mixed $variable name of the PHP variable to bind to the SQL statement parameter
+     * @param  int   $type     Explicit data type for the parameter using the Doctrine_Core::PARAM_* constants. To return
+     *                         an INOUT parameter from a stored procedure, use the bitwise OR operator to set the
+     *                         Doctrine_Core::PARAM_INPUT_OUTPUT bits for the data_type parameter.
+     * @param  int   $length   Length of the data type. To indicate that a parameter is an OUT parameter
+     *                         from a stored procedure, you must explicitly set the length.
+     * @return bool  returns TRUE on success or FALSE on failure
      */
     public function bindParam($column, &$variable, $type = null, $length = null, $driverOptions = array());
 
@@ -124,10 +117,9 @@ public function errorInfo();
      * if any, of their associated parameter markers or pass an array of input-only
      * parameter values
      *
-     * @param array $params an array of values with as many elements as there are
-     *                      bound parameters in the SQL statement being executed
-     *
-     * @return bool returns TRUE on success or FALSE on failure
+     * @param  array $params an array of values with as many elements as there are
+     *                       bound parameters in the SQL statement being executed
+     * @return bool  returns TRUE on success or FALSE on failure
      */
     public function execute($params = null);
 
@@ -164,10 +156,9 @@ public function fetch(
     /**
      * Returns an array containing all of the result set rows.
      *
-     * @param int $fetchStyle Controls how the next row will be returned to the caller.
-     *                        This value must be one of the Doctrine_Core::FETCH_* constants,
-     *                        defaulting to Doctrine_Core::FETCH_BOTH
-     *
+     * @param  int   $fetchStyle Controls how the next row will be returned to the caller.
+     *                           This value must be one of the Doctrine_Core::FETCH_* constants,
+     *                           defaulting to Doctrine_Core::FETCH_BOTH
      * @return array
      */
     public function fetchAll($fetchStyle = Doctrine_Core::FETCH_BOTH);
@@ -176,10 +167,9 @@ public function fetchAll($fetchStyle = Doctrine_Core::FETCH_BOTH);
      * Returns a single column from the next row of a
      * result set or FALSE if there are no more rows.
      *
-     * @param int $columnIndex 0-indexed number of the column you wish to retrieve from the row. If no
-     *                         value is supplied, Doctrine_Adapter_Statement_Interface->fetchColumn()
-     *                         fetches the first column.
-     *
+     * @param  int    $columnIndex 0-indexed number of the column you wish to retrieve from the row. If no
+     *                             value is supplied, Doctrine_Adapter_Statement_Interface->fetchColumn()
+     *                             fetches the first column.
      * @return string returns a single column in the next row of a result set
      */
     public function fetchColumn($columnIndex = 0);
@@ -190,11 +180,10 @@ public function fetchColumn($columnIndex = 0);
      * Fetches the next row and returns it as an object. This function is an alternative to
      * Doctrine_Adapter_Statement_Interface->fetch() with Doctrine_Core::FETCH_CLASS or Doctrine_Core::FETCH_OBJ style.
      *
-     * @param string $className name of the created class, defaults to stdClass
-     * @param array  $args      elements of this array are passed to the constructor
-     *
-     * @return mixed an instance of the required class with property names that correspond
-     *               to the column names or FALSE in case of an error
+     * @param  string $className name of the created class, defaults to stdClass
+     * @param  array  $args      elements of this array are passed to the constructor
+     * @return mixed  an instance of the required class with property names that correspond
+     *                to the column names or FALSE in case of an error
      */
     public function fetchObject($className = 'stdClass', $args = array());
 
@@ -212,8 +201,7 @@ public function getAttribute($attribute);
     /**
      * Returns metadata for a column in a result set.
      *
-     * @param int $column the 0-indexed column in the result set
-     *
+     * @param  int   $column the 0-indexed column in the result set
      * @return array Associative meta data array with the following structure:
      *
      *          native_type                 The PHP native type used to represent the column value.
@@ -254,21 +242,19 @@ public function rowCount();
     /**
      * Set a statement attribute.
      *
-     * @param int   $attribute
-     * @param mixed $value     the value of given attribute
-     *
-     * @return bool returns TRUE on success or FALSE on failure
+     * @param  int   $attribute
+     * @param  mixed $value     the value of given attribute
+     * @return bool  returns TRUE on success or FALSE on failure
      */
     public function setAttribute($attribute, $value);
 
     /**
      * Set the default fetch mode for this statement.
      *
-     * @param int        $mode the fetch mode must be one of the Doctrine_Core::FETCH_* constants
-     * @param mixed|null $arg1
-     * @param mixed|null $arg2
-     *
-     * @return bool returns 1 on success or FALSE on failure
+     * @param  int        $mode the fetch mode must be one of the Doctrine_Core::FETCH_* constants
+     * @param  mixed|null $arg1
+     * @param  mixed|null $arg2
+     * @return bool       returns 1 on success or FALSE on failure
      */
     public function setFetchMode($mode, $arg1 = null, $arg2 = null);
 }
diff --git a/lib/Doctrine/Adapter/Statement/Mock.php b/lib/Doctrine/Adapter/Statement/Mock.php
index c8b8f2483..ca245e6ad 100644
--- a/lib/Doctrine/Adapter/Statement/Mock.php
+++ b/lib/Doctrine/Adapter/Statement/Mock.php
@@ -23,12 +23,8 @@
  * Mock connection adapter statement class. Used for special testing purposes.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7490 $
  */
 class Doctrine_Adapter_Statement_Mock implements Doctrine_Adapter_Statement_Interface
 {
@@ -61,13 +57,12 @@ public function __construct($mock)
      *
      * Bind a column to a PHP variable
      *
-     * @param mixed  $column Number of the column (1-indexed) or name of the column in the result set.
-     *                       If using the column name, be aware that the name should match
-     *                       the case of the column, as returned by the driver.
-     * @param string $param  name of the PHP variable to which the column will be bound
-     * @param int    $type   data type of the parameter, specified by the Doctrine_Core::PARAM_* constants
-     *
-     * @return bool Returns TRUE on success or FALSE on failure
+     * @param  mixed  $column Number of the column (1-indexed) or name of the column in the result set.
+     *                        If using the column name, be aware that the name should match
+     *                        the case of the column, as returned by the driver.
+     * @param  string $param  name of the PHP variable to which the column will be bound
+     * @param  int    $type   data type of the parameter, specified by the Doctrine_Core::PARAM_* constants
+     * @return bool   Returns TRUE on success or FALSE on failure
      */
     public function bindColumn($column, $param, $type = null)
     {
@@ -79,13 +74,12 @@ public function bindColumn($column, $param, $type = null)
      * Binds a value to a corresponding named or question mark
      * placeholder in the SQL statement that was use to prepare the statement.
      *
-     * @param mixed $param Parameter identifier. For a prepared statement using named placeholders,
-     *                     this will be a parameter name of the form :name. For a prepared statement
-     *                     using question mark placeholders, this will be the 1-indexed position of the parameter
-     * @param mixed $value the value to bind to the parameter
-     * @param int   $type  explicit data type for the parameter using the Doctrine_Core::PARAM_* constants
-     *
-     * @return bool returns TRUE on success or FALSE on failure
+     * @param  mixed $param Parameter identifier. For a prepared statement using named placeholders,
+     *                      this will be a parameter name of the form :name. For a prepared statement
+     *                      using question mark placeholders, this will be the 1-indexed position of the parameter
+     * @param  mixed $value the value to bind to the parameter
+     * @param  int   $type  explicit data type for the parameter using the Doctrine_Core::PARAM_* constants
+     * @return bool  returns TRUE on success or FALSE on failure
      */
     public function bindValue($param, $value, $type = null)
     {
@@ -104,14 +98,13 @@ public function bindValue($param, $value, $type = null)
      * of stored procedures that return data as output parameters, and some also as input/output
      * parameters that both send in data and are updated to receive it.
      *
-     * @param mixed $variable name of the PHP variable to bind to the SQL statement parameter
-     * @param int   $type     Explicit data type for the parameter using the Doctrine_Core::PARAM_* constants. To return
-     *                        an INOUT parameter from a stored procedure, use the bitwise OR operator to set the
-     *                        Doctrine_Core::PARAM_INPUT_OUTPUT bits for the data_type parameter.
-     * @param int   $length   Length of the data type. To indicate that a parameter is an OUT parameter
-     *                        from a stored procedure, you must explicitly set the length.
-     *
-     * @return bool returns TRUE on success or FALSE on failure
+     * @param  mixed $variable name of the PHP variable to bind to the SQL statement parameter
+     * @param  int   $type     Explicit data type for the parameter using the Doctrine_Core::PARAM_* constants. To return
+     *                         an INOUT parameter from a stored procedure, use the bitwise OR operator to set the
+     *                         Doctrine_Core::PARAM_INPUT_OUTPUT bits for the data_type parameter.
+     * @param  int   $length   Length of the data type. To indicate that a parameter is an OUT parameter
+     *                         from a stored procedure, you must explicitly set the length.
+     * @return bool  returns TRUE on success or FALSE on failure
      */
     public function bindParam($column, &$variable, $type = null, $length = null, $driverOptions = array())
     {
@@ -226,10 +219,9 @@ public function fetchAll($fetchMode = Doctrine_Core::FETCH_BOTH)
      * if any, of their associated parameter markers or pass an array of input-only
      * parameter values
      *
-     * @param array $params an array of values with as many elements as there are
-     *                      bound parameters in the SQL statement being executed
-     *
-     * @return bool returns TRUE on success or FALSE on failure
+     * @param  array $params an array of values with as many elements as there are
+     *                       bound parameters in the SQL statement being executed
+     * @return bool  returns TRUE on success or FALSE on failure
      */
     public function execute($params = null)
     {
@@ -246,10 +238,9 @@ public function execute($params = null)
      * Returns a single column from the next row of a
      * result set or FALSE if there are no more rows.
      *
-     * @param int $columnIndex 0-indexed number of the column you wish to retrieve from the row. If no
-     *                         value is supplied, Doctrine_Adapter_Statement_Interface->fetchColumn()
-     *                         fetches the first column.
-     *
+     * @param  int    $columnIndex 0-indexed number of the column you wish to retrieve from the row. If no
+     *                             value is supplied, Doctrine_Adapter_Statement_Interface->fetchColumn()
+     *                             fetches the first column.
      * @return string returns a single column in the next row of a result set
      */
     public function fetchColumn($columnIndex = 0)
@@ -265,11 +256,10 @@ public function fetchColumn($columnIndex = 0)
      * Fetches the next row and returns it as an object. This function is an alternative to
      * Doctrine_Adapter_Statement_Interface->fetch() with Doctrine_Core::FETCH_CLASS or Doctrine_Core::FETCH_OBJ style.
      *
-     * @param string $className name of the created class, defaults to stdClass
-     * @param array  $args      elements of this array are passed to the constructor
-     *
-     * @return mixed an instance of the required class with property names that correspond
-     *               to the column names or FALSE in case of an error
+     * @param  string $className name of the created class, defaults to stdClass
+     * @param  array  $args      elements of this array are passed to the constructor
+     * @return mixed  an instance of the required class with property names that correspond
+     *                to the column names or FALSE in case of an error
      */
     public function fetchObject($className = 'stdClass', $args = array())
     {
@@ -316,8 +306,7 @@ public function rowCount()
      *
      * Returns metadata for a column in a result set
      *
-     * @param int $column the 0-indexed column in the result set
-     *
+     * @param  int   $column the 0-indexed column in the result set
      * @return array Associative meta data array with the following structure:
      *
      *          native_type                 The PHP native type used to represent the column value.
@@ -352,10 +341,9 @@ public function getAttribute($attribute)
      *
      * Set a statement attribute
      *
-     * @param int   $attribute
-     * @param mixed $value     the value of given attribute
-     *
-     * @return bool returns TRUE on success or FALSE on failure
+     * @param  int   $attribute
+     * @param  mixed $value     the value of given attribute
+     * @return bool  returns TRUE on success or FALSE on failure
      */
     public function setAttribute($attribute, $value)
     {
@@ -366,11 +354,10 @@ public function setAttribute($attribute, $value)
      *
      * Set the default fetch mode for this statement
      *
-     * @param int        $mode the fetch mode must be one of the Doctrine_Core::FETCH_* constants
-     * @param mixed|null $arg1
-     * @param mixed|null $arg2
-     *
-     * @return bool returns 1 on success or FALSE on failure
+     * @param  int        $mode the fetch mode must be one of the Doctrine_Core::FETCH_* constants
+     * @param  mixed|null $arg1
+     * @param  mixed|null $arg2
+     * @return bool       returns 1 on success or FALSE on failure
      */
     public function setFetchMode($mode, $arg1 = null, $arg2 = null)
     {
diff --git a/lib/Doctrine/Adapter/Statement/Oracle.php b/lib/Doctrine/Adapter/Statement/Oracle.php
index e6f70185c..b2812e669 100644
--- a/lib/Doctrine/Adapter/Statement/Oracle.php
+++ b/lib/Doctrine/Adapter/Statement/Oracle.php
@@ -25,12 +25,8 @@
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  * @author      vadik56
  * @author      Miloslav Kmet <adrive-nospam@hip-hop.sk>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Rev$
  */
 class Doctrine_Adapter_Statement_Oracle implements Doctrine_Adapter_Statement_Interface
 {
@@ -88,13 +84,12 @@ public function __construct(Doctrine_Adapter_Oracle $connection, $query, $execut
     /**
      * Bind a column to a PHP variable.
      *
-     * @param mixed  $column Number of the column (1-indexed) or name of the column in the result set.
-     *                       If using the column name, be aware that the name should match
-     *                       the case of the column, as returned by the driver.
-     * @param string $param  name of the PHP variable to which the column will be bound
-     * @param int    $type   data type of the parameter, specified by the Doctrine_Core::PARAM_* constants
-     *
-     * @return bool Returns TRUE on success or FALSE on failure
+     * @param  mixed  $column Number of the column (1-indexed) or name of the column in the result set.
+     *                        If using the column name, be aware that the name should match
+     *                        the case of the column, as returned by the driver.
+     * @param  string $param  name of the PHP variable to which the column will be bound
+     * @param  int    $type   data type of the parameter, specified by the Doctrine_Core::PARAM_* constants
+     * @return bool   Returns TRUE on success or FALSE on failure
      */
     public function bindColumn($column, $param, $type = null)
     {
@@ -105,13 +100,12 @@ public function bindColumn($column, $param, $type = null)
      * Binds a value to a corresponding named or question mark
      * placeholder in the SQL statement that was use to prepare the statement.
      *
-     * @param mixed $param Parameter identifier. For a prepared statement using named placeholders,
-     *                     this will be a parameter name of the form :name. For a prepared statement
-     *                     using question mark placeholders, this will be the 1-indexed position of the parameter
-     * @param mixed $value the value to bind to the parameter
-     * @param int   $type  explicit data type for the parameter using the Doctrine_Core::PARAM_* constants
-     *
-     * @return bool returns TRUE on success or FALSE on failure
+     * @param  mixed $param Parameter identifier. For a prepared statement using named placeholders,
+     *                      this will be a parameter name of the form :name. For a prepared statement
+     *                      using question mark placeholders, this will be the 1-indexed position of the parameter
+     * @param  mixed $value the value to bind to the parameter
+     * @param  int   $type  explicit data type for the parameter using the Doctrine_Core::PARAM_* constants
+     * @return bool  returns TRUE on success or FALSE on failure
      */
     public function bindValue($param, $value, $type = null)
     {
@@ -133,14 +127,13 @@ public function bindValue($param, $value, $type = null)
      * of stored procedures that return data as output parameters, and some also as input/output
      * parameters that both send in data and are updated to receive it.
      *
-     * @param mixed $variable name of the PHP variable to bind to the SQL statement parameter
-     * @param int   $type     Explicit data type for the parameter using the Doctrine_Core::PARAM_* constants. To return
-     *                        an INOUT parameter from a stored procedure, use the bitwise OR operator to set the
-     *                        Doctrine_Core::PARAM_INPUT_OUTPUT bits for the data_type parameter.
-     * @param int   $length   Length of the data type. To indicate that a parameter is an OUT parameter
-     *                        from a stored procedure, you must explicitly set the length.
-     *
-     * @return bool returns TRUE on success or FALSE on failure
+     * @param  mixed $variable name of the PHP variable to bind to the SQL statement parameter
+     * @param  int   $type     Explicit data type for the parameter using the Doctrine_Core::PARAM_* constants. To return
+     *                         an INOUT parameter from a stored procedure, use the bitwise OR operator to set the
+     *                         Doctrine_Core::PARAM_INPUT_OUTPUT bits for the data_type parameter.
+     * @param  int   $length   Length of the data type. To indicate that a parameter is an OUT parameter
+     *                         from a stored procedure, you must explicitly set the length.
+     * @return bool  returns TRUE on success or FALSE on failure
      */
     public function bindParam($column, &$variable, $type = null, $length = null, $driverOptions = array())
     {
@@ -255,10 +248,9 @@ private function getOciError()
      * if any, of their associated parameter markers or pass an array of input-only
      * parameter values
      *
-     * @param array $params an array of values with as many elements as there are
-     *                      bound parameters in the SQL statement being executed
-     *
-     * @return bool returns TRUE on success or FALSE on failure
+     * @param  array $params an array of values with as many elements as there are
+     *                       bound parameters in the SQL statement being executed
+     * @return bool  returns TRUE on success or FALSE on failure
      */
     public function execute($params = null)
     {
@@ -345,10 +337,9 @@ public function fetch($fetchStyle = Doctrine_Core::FETCH_BOTH, $cursorOrientatio
     /**
      * Returns an array containing all of the result set rows.
      *
-     * @param int $fetchStyle Controls how the next row will be returned to the caller.
-     *                        This value must be one of the Doctrine_Core::FETCH_* constants,
-     *                        defaulting to Doctrine_Core::FETCH_BOTH
-     *
+     * @param  int   $fetchStyle Controls how the next row will be returned to the caller.
+     *                           This value must be one of the Doctrine_Core::FETCH_* constants,
+     *                           defaulting to Doctrine_Core::FETCH_BOTH
      * @return array
      */
     public function fetchAll($fetchStyle = Doctrine_Core::FETCH_BOTH, $colnum = 0)
@@ -383,10 +374,9 @@ public function fetchAll($fetchStyle = Doctrine_Core::FETCH_BOTH, $colnum = 0)
      * Returns a single column from the next row of a
      * result set or FALSE if there are no more rows.
      *
-     * @param int $columnIndex 0-indexed number of the column you wish to retrieve from the row. If no
-     *                         value is supplied, Doctrine_Adapter_Statement_Interface->fetchColumn()
-     *                         fetches the first column.
-     *
+     * @param  int    $columnIndex 0-indexed number of the column you wish to retrieve from the row. If no
+     *                             value is supplied, Doctrine_Adapter_Statement_Interface->fetchColumn()
+     *                             fetches the first column.
      * @return string returns a single column in the next row of a result set
      */
     public function fetchColumn($columnIndex = 0)
@@ -407,11 +397,10 @@ public function fetchColumn($columnIndex = 0)
      * Fetches the next row and returns it as an object. This function is an alternative to
      * Doctrine_Adapter_Statement_Interface->fetch() with Doctrine_Core::FETCH_CLASS or Doctrine_Core::FETCH_OBJ style.
      *
-     * @param string $className name of the created class, defaults to stdClass
-     * @param array  $args      elements of this array are passed to the constructor
-     *
-     * @return mixed an instance of the required class with property names that correspond
-     *               to the column names or FALSE in case of an error
+     * @param  string $className name of the created class, defaults to stdClass
+     * @param  array  $args      elements of this array are passed to the constructor
+     * @return mixed  an instance of the required class with property names that correspond
+     *                to the column names or FALSE in case of an error
      */
     public function fetchObject($className = 'stdClass', $args = array())
     {
@@ -450,8 +439,7 @@ public function fetchObject($className = 'stdClass', $args = array())
     /**
      * Returns metadata for a column in a result set.
      *
-     * @param int $column the 0-indexed column in the result set
-     *
+     * @param  int   $column the 0-indexed column in the result set
      * @return array Associative meta data array with the following structure:
      *
      *          native_type                 The PHP native type used to represent the column value.
@@ -514,10 +502,9 @@ public function rowCount()
     /**
      * Set a statement attribute.
      *
-     * @param int   $attribute
-     * @param mixed $value     the value of given attribute
-     *
-     * @return bool returns TRUE on success or FALSE on failure
+     * @param  int   $attribute
+     * @param  mixed $value     the value of given attribute
+     * @return bool  returns TRUE on success or FALSE on failure
      */
     public function setAttribute($attribute, $value)
     {
@@ -547,11 +534,10 @@ public function getAttribute($attribute)
     /**
      * Set the default fetch mode for this statement.
      *
-     * @param int        $mode the fetch mode must be one of the Doctrine_Core::FETCH_* constants
-     * @param mixed|null $arg1
-     * @param mixed|null $arg2
-     *
-     * @return bool returns 1 on success or FALSE on failure
+     * @param  int        $mode the fetch mode must be one of the Doctrine_Core::FETCH_* constants
+     * @param  mixed|null $arg1
+     * @param  mixed|null $arg2
+     * @return bool       returns 1 on success or FALSE on failure
      */
     public function setFetchMode($mode, $arg1 = null, $arg2 = null)
     {
@@ -577,9 +563,8 @@ private function handleError($params = array())
      * Parse actual query from queryString and returns OCI statement handler.
      *
      * @param  string       Query string to parse, if NULL, $this->queryString is used
-     * @param mixed|null $query
-     *
-     * @return resource OCI statement handler
+     * @param  mixed|null $query
+     * @return resource   OCI statement handler
      */
     private function parseQuery($query = null)
     {
diff --git a/lib/Doctrine/AuditLog.php b/lib/Doctrine/AuditLog.php
index 83daa5f53..44316989c 100644
--- a/lib/Doctrine/AuditLog.php
+++ b/lib/Doctrine/AuditLog.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_AuditLog.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
@@ -110,10 +105,9 @@ public function setTableDefinition()
     /**
      * Get array of information for the passed record and the specified version.
      *
-     * @param int  $version
-     * @param int  $hydrationMode
-     * @param bool $asCollection
-     *
+     * @param  int   $version
+     * @param  int   $hydrationMode
+     * @param  bool  $asCollection
      * @return array An array or Doctrine_Collection or a Doctrine_Record
      */
     public function getVersion(Doctrine_Record $record, $version, $hydrationMode = Doctrine_Core::HYDRATE_ARRAY, $asCollection = true)
diff --git a/lib/Doctrine/AuditLog/Listener.php b/lib/Doctrine/AuditLog/Listener.php
index 6b745428a..f0cdd93ea 100644
--- a/lib/Doctrine/AuditLog/Listener.php
+++ b/lib/Doctrine/AuditLog/Listener.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_AuditLog_Listener.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
diff --git a/lib/Doctrine/AuditLog/Listener/Microtime.php b/lib/Doctrine/AuditLog/Listener/Microtime.php
index 65f7871e2..f8d8a93fd 100644
--- a/lib/Doctrine/AuditLog/Listener/Microtime.php
+++ b/lib/Doctrine/AuditLog/Listener/Microtime.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_AuditLog_Listener.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @author      Lukas Smith <smith@pooteeweet.org>
  */
diff --git a/lib/Doctrine/Builder.php b/lib/Doctrine/Builder.php
index c566b54fc..c523b64c4 100644
--- a/lib/Doctrine/Builder.php
+++ b/lib/Doctrine/Builder.php
@@ -24,12 +24,6 @@
  *
  * @see        www.doctrine-project.org
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
- * @since       1.0
- *
- * @version     $Revision: 4593 $
- *
  * @author      Jonathan H. Wage <jwage@mac.com>
  */
 class Doctrine_Builder
diff --git a/lib/Doctrine/Cache/Apc.php b/lib/Doctrine/Cache/Apc.php
index 50244fd65..89f8d715d 100644
--- a/lib/Doctrine/Cache/Apc.php
+++ b/lib/Doctrine/Cache/Apc.php
@@ -22,12 +22,7 @@
 /**
  * APC Cache Driver.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7490 $
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  * @author      Jonathan H. Wage <jonwage@gmail.com>
@@ -50,10 +45,9 @@ public function __construct($options = array())
     /**
      * Fetch a cache record from this cache driver instance.
      *
-     * @param string $id                cache id
-     * @param bool   $testCacheValidity if set to false, the cache validity won't be tested
-     *
-     * @return mixed Returns either the cached data or false
+     * @param  string $id                cache id
+     * @param  bool   $testCacheValidity if set to false, the cache validity won't be tested
+     * @return mixed  Returns either the cached data or false
      */
     protected function _doFetch($id, $testCacheValidity = true)
     {
@@ -63,9 +57,8 @@ protected function _doFetch($id, $testCacheValidity = true)
     /**
      * Test if a cache record exists for the passed id.
      *
-     * @param string $id cache id
-     *
-     * @return mixed false (a cache is not available) or "last modified" timestamp (int) of the available cache record
+     * @param  string $id cache id
+     * @return mixed  false (a cache is not available) or "last modified" timestamp (int) of the available cache record
      */
     protected function _doContains($id)
     {
@@ -79,11 +72,10 @@ protected function _doContains($id)
      * Save a cache record directly. This method is implemented by the cache
      * drivers and used in Doctrine_Cache_Driver::save().
      *
-     * @param string $id       cache id
-     * @param string $data     data to cache
-     * @param int    $lifeTime if != false, set a specific lifetime for this cache record (null => infinite lifeTime)
-     *
-     * @return bool true if no problem
+     * @param  string $id       cache id
+     * @param  string $data     data to cache
+     * @param  int    $lifeTime if != false, set a specific lifetime for this cache record (null => infinite lifeTime)
+     * @return bool   true if no problem
      */
     protected function _doSave($id, $data, $lifeTime = false)
     {
@@ -94,9 +86,8 @@ protected function _doSave($id, $data, $lifeTime = false)
      * Remove a cache record directly. This method is implemented by the cache
      * drivers and used in Doctrine_Cache_Driver::delete().
      *
-     * @param string $id cache id
-     *
-     * @return bool true if no problem
+     * @param  string $id cache id
+     * @return bool   true if no problem
      */
     protected function _doDelete($id)
     {
diff --git a/lib/Doctrine/Cache/Array.php b/lib/Doctrine/Cache/Array.php
index 26e9aa976..4fef1fd63 100644
--- a/lib/Doctrine/Cache/Array.php
+++ b/lib/Doctrine/Cache/Array.php
@@ -22,12 +22,7 @@
 /**
  * Array cache driver.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7490 $
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  * @author      Jonathan H. Wage <jonwage@gmail.com>
@@ -42,10 +37,9 @@ class Doctrine_Cache_Array extends Doctrine_Cache_Driver
     /**
      * Fetch a cache record from this cache driver instance.
      *
-     * @param string $id                cache id
-     * @param bool   $testCacheValidity if set to false, the cache validity won't be tested
-     *
-     * @return mixed Returns either the cached data or false
+     * @param  string $id                cache id
+     * @param  bool   $testCacheValidity if set to false, the cache validity won't be tested
+     * @return mixed  Returns either the cached data or false
      */
     protected function _doFetch($id, $testCacheValidity = true)
     {
@@ -59,9 +53,8 @@ protected function _doFetch($id, $testCacheValidity = true)
     /**
      * Test if a cache record exists for the passed id.
      *
-     * @param string $id cache id
-     *
-     * @return mixed false (a cache is not available) or "last modified" timestamp (int) of the available cache record
+     * @param  string $id cache id
+     * @return mixed  false (a cache is not available) or "last modified" timestamp (int) of the available cache record
      */
     protected function _doContains($id)
     {
@@ -72,11 +65,10 @@ protected function _doContains($id)
      * Save a cache record directly. This method is implemented by the cache
      * drivers and used in Doctrine_Cache_Driver::save().
      *
-     * @param string $id       cache id
-     * @param string $data     data to cache
-     * @param int    $lifeTime if != false, set a specific lifetime for this cache record (null => infinite lifeTime)
-     *
-     * @return bool true if no problem
+     * @param  string $id       cache id
+     * @param  string $data     data to cache
+     * @param  int    $lifeTime if != false, set a specific lifetime for this cache record (null => infinite lifeTime)
+     * @return bool   true if no problem
      */
     protected function _doSave($id, $data, $lifeTime = false)
     {
@@ -89,9 +81,8 @@ protected function _doSave($id, $data, $lifeTime = false)
      * Remove a cache record directly. This method is implemented by the cache
      * drivers and used in Doctrine_Cache_Driver::delete().
      *
-     * @param string $id cache id
-     *
-     * @return bool true if no problem
+     * @param  string $id cache id
+     * @return bool   true if no problem
      */
     protected function _doDelete($id)
     {
diff --git a/lib/Doctrine/Cache/Db.php b/lib/Doctrine/Cache/Db.php
index 36275b72c..ef394fa3a 100644
--- a/lib/Doctrine/Cache/Db.php
+++ b/lib/Doctrine/Cache/Db.php
@@ -22,12 +22,7 @@
 /**
  * Database cache driver.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7490 $
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  * @author      Jonathan H. Wage <jonwage@gmail.com>
@@ -66,10 +61,9 @@ public function getConnection()
     /**
      * Fetch a cache record from this cache driver instance.
      *
-     * @param string $id                cache id
-     * @param bool   $testCacheValidity if set to false, the cache validity won't be tested
-     *
-     * @return mixed Returns either the cached data or false
+     * @param  string $id                cache id
+     * @param  bool   $testCacheValidity if set to false, the cache validity won't be tested
+     * @return mixed  Returns either the cached data or false
      */
     protected function _doFetch($id, $testCacheValidity = true)
     {
@@ -92,9 +86,8 @@ protected function _doFetch($id, $testCacheValidity = true)
     /**
      * Test if a cache record exists for the passed id.
      *
-     * @param string $id cache id
-     *
-     * @return mixed false (a cache is not available) or "last modified" timestamp (int) of the available cache record
+     * @param  string $id cache id
+     * @return mixed  false (a cache is not available) or "last modified" timestamp (int) of the available cache record
      */
     protected function _doContains($id)
     {
@@ -114,11 +107,10 @@ protected function _doContains($id)
      * Save a cache record directly. This method is implemented by the cache
      * drivers and used in Doctrine_Cache_Driver::save().
      *
-     * @param string $id       cache id
-     * @param string $data     data to cache
-     * @param int    $lifeTime if != false, set a specific lifetime for this cache record (null => infinite lifeTime)
-     *
-     * @return bool true if no problem
+     * @param  string $id       cache id
+     * @param  string $data     data to cache
+     * @param  int    $lifeTime if != false, set a specific lifetime for this cache record (null => infinite lifeTime)
+     * @return bool   true if no problem
      */
     protected function _doSave($id, $data, $lifeTime = false, $saveKey = true)
     {
@@ -156,9 +148,8 @@ protected function _doSave($id, $data, $lifeTime = false, $saveKey = true)
      * Remove a cache record directly. This method is implemented by the cache
      * drivers and used in Doctrine_Cache_Driver::delete().
      *
-     * @param string $id cache id
-     *
-     * @return bool true if no problem
+     * @param  string $id cache id
+     * @return bool   true if no problem
      */
     protected function _doDelete($id)
     {
@@ -198,8 +189,7 @@ public function createTable()
      * Convert hex data to binary data. If passed data is not hex then
      * it is returned as is.
      *
-     * @param string $hex
-     *
+     * @param  string $hex
      * @return string $binary
      */
     protected function _hex2bin($hex)
diff --git a/lib/Doctrine/Cache/Driver.php b/lib/Doctrine/Cache/Driver.php
index 7b74998d2..9de58b1f5 100644
--- a/lib/Doctrine/Cache/Driver.php
+++ b/lib/Doctrine/Cache/Driver.php
@@ -22,12 +22,7 @@
 /**
  * Abstract cache driver class.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7490 $
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  * @author      Jonathan H. Wage <jonwage@gmail.com>
@@ -50,10 +45,9 @@ public function __construct($options = array())
     /**
      * Set option name and value.
      *
-     * @param mixed $option the option name
-     * @param mixed $value  option value
-     *
-     * @return bool TRUE on success, FALSE on failure
+     * @param  mixed $option the option name
+     * @param  mixed $value  option value
+     * @return bool  TRUE on success, FALSE on failure
      */
     public function setOption($option, $value)
     {
@@ -69,8 +63,7 @@ public function setOption($option, $value)
     /**
      * Get value of option.
      *
-     * @param mixed $option the option name
-     *
+     * @param  mixed $option the option name
      * @return mixed option value
      */
     public function getOption($option)
@@ -85,10 +78,9 @@ public function getOption($option)
     /**
      * Fetch a cache record from this cache driver instance.
      *
-     * @param string $id                cache id
-     * @param bool   $testCacheValidity if set to false, the cache validity won't be tested
-     *
-     * @return mixed Returns either the cached data or false
+     * @param  string $id                cache id
+     * @param  bool   $testCacheValidity if set to false, the cache validity won't be tested
+     * @return mixed  Returns either the cached data or false
      */
     public function fetch($id, $testCacheValidity = true)
     {
@@ -100,9 +92,8 @@ public function fetch($id, $testCacheValidity = true)
     /**
      * Test if a cache record exists for the passed id.
      *
-     * @param string $id cache id
-     *
-     * @return mixed false (a cache is not available) or "last modified" timestamp (int) of the available cache record
+     * @param  string $id cache id
+     * @return mixed  false (a cache is not available) or "last modified" timestamp (int) of the available cache record
      */
     public function contains($id)
     {
@@ -114,11 +105,10 @@ public function contains($id)
     /**
      * Save some string datas into a cache record.
      *
-     * @param string $id       cache id
-     * @param string $data     data to cache
-     * @param int    $lifeTime if != false, set a specific lifetime for this cache record (null => infinite lifeTime)
-     *
-     * @return bool true if no problem
+     * @param  string $id       cache id
+     * @param  string $data     data to cache
+     * @param  int    $lifeTime if != false, set a specific lifetime for this cache record (null => infinite lifeTime)
+     * @return bool   true if no problem
      */
     public function save($id, $data, $lifeTime = false)
     {
@@ -132,9 +122,8 @@ public function save($id, $data, $lifeTime = false)
      *
      * Note: This method accepts wildcards with the * character
      *
-     * @param string $id cache id
-     *
-     * @return bool true if no problem
+     * @param  string $id cache id
+     * @return bool   true if no problem
      */
     public function delete($id)
     {
@@ -150,9 +139,8 @@ public function delete($id)
     /**
      * Delete cache entries where the key matches a PHP regular expressions.
      *
-     * @param string $regex
-     *
-     * @return int $count The number of deleted cache entries
+     * @param  string $regex
+     * @return int    $count The number of deleted cache entries
      */
     public function deleteByRegex($regex)
     {
@@ -173,9 +161,8 @@ public function deleteByRegex($regex)
     /**
      * Delete cache entries where the key has the passed prefix.
      *
-     * @param string $prefix
-     *
-     * @return int $count The number of deleted cache entries
+     * @param  string $prefix
+     * @return int    $count The number of deleted cache entries
      */
     public function deleteByPrefix($prefix)
     {
@@ -196,9 +183,8 @@ public function deleteByPrefix($prefix)
     /**
      * Delete cache entries where the key has the passed suffix.
      *
-     * @param string $suffix
-     *
-     * @return int $count The number of deleted cache entries
+     * @param  string $suffix
+     * @return int    $count The number of deleted cache entries
      */
     public function deleteBySuffix($suffix)
     {
@@ -237,8 +223,7 @@ public function deleteAll()
     /**
      * Get the hash key passing its suffix.
      *
-     * @param string $id The hash key suffix
-     *
+     * @param  string $id The hash key suffix
      * @return string Hash key to be used by drivers
      */
     protected function _getKey($id)
@@ -262,19 +247,17 @@ abstract protected function _getCacheKeys();
     /**
      * Fetch a cache record from this cache driver instance.
      *
-     * @param string $id                cache id
-     * @param bool   $testCacheValidity if set to false, the cache validity won't be tested
-     *
-     * @return mixed Returns either the cached data or false
+     * @param  string $id                cache id
+     * @param  bool   $testCacheValidity if set to false, the cache validity won't be tested
+     * @return mixed  Returns either the cached data or false
      */
     abstract protected function _doFetch($id, $testCacheValidity = true);
 
     /**
      * Test if a cache record exists for the passed id.
      *
-     * @param string $id cache id
-     *
-     * @return mixed false (a cache is not available) or "last modified" timestamp (int) of the available cache record
+     * @param  string $id cache id
+     * @return mixed  false (a cache is not available) or "last modified" timestamp (int) of the available cache record
      */
     abstract protected function _doContains($id);
 
@@ -282,11 +265,10 @@ abstract protected function _doContains($id);
      * Save a cache record directly. This method is implemented by the cache
      * drivers and used in Doctrine_Cache_Driver::save().
      *
-     * @param string $id       cache id
-     * @param string $data     data to cache
-     * @param int    $lifeTime if != false, set a specific lifetime for this cache record (null => infinite lifeTime)
-     *
-     * @return bool true if no problem
+     * @param  string $id       cache id
+     * @param  string $data     data to cache
+     * @param  int    $lifeTime if != false, set a specific lifetime for this cache record (null => infinite lifeTime)
+     * @return bool   true if no problem
      */
     abstract protected function _doSave($id, $data, $lifeTime = false);
 
@@ -294,9 +276,8 @@ abstract protected function _doSave($id, $data, $lifeTime = false);
      * Remove a cache record directly. This method is implemented by the cache
      * drivers and used in Doctrine_Cache_Driver::delete().
      *
-     * @param string $id cache id
-     *
-     * @return bool true if no problem
+     * @param  string $id cache id
+     * @return bool   true if no problem
      */
     abstract protected function _doDelete($id);
 }
diff --git a/lib/Doctrine/Cache/Exception.php b/lib/Doctrine/Cache/Exception.php
index 998a51710..3aeede3b8 100644
--- a/lib/Doctrine/Cache/Exception.php
+++ b/lib/Doctrine/Cache/Exception.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine cache exception class.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7490 $
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  * @author      Jonathan H. Wage <jonwage@gmail.com>
diff --git a/lib/Doctrine/Cache/Interface.php b/lib/Doctrine/Cache/Interface.php
index 1274cf75f..ea01ac354 100644
--- a/lib/Doctrine/Cache/Interface.php
+++ b/lib/Doctrine/Cache/Interface.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine cache driver interface.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7490 $
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  * @author      Jonathan H. Wage <jonwage@gmail.com>
@@ -37,39 +32,35 @@ interface Doctrine_Cache_Interface
     /**
      * Fetch a cache record from this cache driver instance.
      *
-     * @param string $id                cache id
-     * @param bool   $testCacheValidity if set to false, the cache validity won't be tested
-     *
-     * @return mixed Returns either the cached data or false
+     * @param  string $id                cache id
+     * @param  bool   $testCacheValidity if set to false, the cache validity won't be tested
+     * @return mixed  Returns either the cached data or false
      */
     public function fetch($id, $testCacheValidity = true);
 
     /**
      * Test if a cache record exists for the passed id.
      *
-     * @param string $id cache id
-     *
-     * @return mixed false (a cache is not available) or "last modified" timestamp (int) of the available cache record
+     * @param  string $id cache id
+     * @return mixed  false (a cache is not available) or "last modified" timestamp (int) of the available cache record
      */
     public function contains($id);
 
     /**
      * Save a cache record and add the key to the index of cached keys.
      *
-     * @param string $id       cache id
-     * @param string $data     data to cache
-     * @param int    $lifeTime if != false, set a specific lifetime for this cache record (null => infinite lifeTime)
-     *
-     * @return bool true if no problem
+     * @param  string $id       cache id
+     * @param  string $data     data to cache
+     * @param  int    $lifeTime if != false, set a specific lifetime for this cache record (null => infinite lifeTime)
+     * @return bool   true if no problem
      */
     public function save($id, $data, $lifeTime = false);
 
     /**
      * Remove a cache record.
      *
-     * @param string $id cache id
-     *
-     * @return bool true if no problem
+     * @param  string $id cache id
+     * @return bool   true if no problem
      */
     public function delete($id);
 }
diff --git a/lib/Doctrine/Cache/Memcache.php b/lib/Doctrine/Cache/Memcache.php
index ab0afa8cf..28e1a35fd 100644
--- a/lib/Doctrine/Cache/Memcache.php
+++ b/lib/Doctrine/Cache/Memcache.php
@@ -22,12 +22,7 @@
 /**
  * Memcache cache driver.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7490 $
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  * @author      Jonathan H. Wage <jonwage@gmail.com>
@@ -76,9 +71,8 @@ public function __construct($options = array())
     /**
      * Test if a cache record exists for the passed id.
      *
-     * @param string $id cache id
-     *
-     * @return mixed Returns either the cached data or false
+     * @param  string $id cache id
+     * @return mixed  Returns either the cached data or false
      */
     protected function _doFetch($id, $testCacheValidity = true)
     {
@@ -88,9 +82,8 @@ protected function _doFetch($id, $testCacheValidity = true)
     /**
      * Test if a cache is available or not (for the given id).
      *
-     * @param string $id cache id
-     *
-     * @return mixed false (a cache is not available) or "last modified" timestamp (int) of the available cache record
+     * @param  string $id cache id
+     * @return mixed  false (a cache is not available) or "last modified" timestamp (int) of the available cache record
      */
     protected function _doContains($id)
     {
@@ -101,11 +94,10 @@ protected function _doContains($id)
      * Save a cache record directly. This method is implemented by the cache
      * drivers and used in Doctrine_Cache_Driver::save().
      *
-     * @param string $id       cache id
-     * @param string $data     data to cache
-     * @param int    $lifeTime if != false, set a specific lifetime for this cache record (null => infinite lifeTime)
-     *
-     * @return bool true if no problem
+     * @param  string $id       cache id
+     * @param  string $data     data to cache
+     * @param  int    $lifeTime if != false, set a specific lifetime for this cache record (null => infinite lifeTime)
+     * @return bool   true if no problem
      */
     protected function _doSave($id, $data, $lifeTime = false)
     {
@@ -122,9 +114,8 @@ protected function _doSave($id, $data, $lifeTime = false)
      * Remove a cache record directly. This method is implemented by the cache
      * drivers and used in Doctrine_Cache_Driver::delete().
      *
-     * @param string $id cache id
-     *
-     * @return bool true if no problem
+     * @param  string $id cache id
+     * @return bool   true if no problem
      */
     protected function _doDelete($id)
     {
diff --git a/lib/Doctrine/Cache/Xcache.php b/lib/Doctrine/Cache/Xcache.php
index a24161e29..d739e4b07 100644
--- a/lib/Doctrine/Cache/Xcache.php
+++ b/lib/Doctrine/Cache/Xcache.php
@@ -22,12 +22,7 @@
 /**
  * Xcache cache driver.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: $
  *
  * @author      Dmitry Bakaleinik (dima@snaiper.net)
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
@@ -52,9 +47,8 @@ public function __construct($options = array())
     /**
      * Test if a cache record exists for the passed id.
      *
-     * @param string $id cache id
-     *
-     * @return mixed Returns either the cached data or false
+     * @param  string $id cache id
+     * @return mixed  Returns either the cached data or false
      */
     protected function _doFetch($id, $testCacheValidity = true)
     {
@@ -64,9 +58,8 @@ protected function _doFetch($id, $testCacheValidity = true)
     /**
      * Test if a cache is available or not (for the given id).
      *
-     * @param string $id cache id
-     *
-     * @return mixed false (a cache is not available) or "last modified" timestamp (int) of the available cache record
+     * @param  string $id cache id
+     * @return mixed  false (a cache is not available) or "last modified" timestamp (int) of the available cache record
      */
     protected function _doContains($id)
     {
@@ -77,11 +70,10 @@ protected function _doContains($id)
      * Save a cache record directly. This method is implemented by the cache
      * drivers and used in Doctrine_Cache_Driver::save().
      *
-     * @param string $id       cache id
-     * @param string $data     data to cache
-     * @param int    $lifeTime if != false, set a specific lifetime for this cache record (null => infinite lifeTime)
-     *
-     * @return bool true if no problem
+     * @param  string $id       cache id
+     * @param  string $data     data to cache
+     * @param  int    $lifeTime if != false, set a specific lifetime for this cache record (null => infinite lifeTime)
+     * @return bool   true if no problem
      */
     protected function _doSave($id, $data, $lifeTime = false)
     {
@@ -92,9 +84,8 @@ protected function _doSave($id, $data, $lifeTime = false)
      * Remove a cache record directly. This method is implemented by the cache
      * drivers and used in Doctrine_Cache_Driver::delete().
      *
-     * @param string $id cache id
-     *
-     * @return bool true if no problem
+     * @param  string $id cache id
+     * @return bool   true if no problem
      */
     protected function _doDelete($id)
     {
diff --git a/lib/Doctrine/Cli.php b/lib/Doctrine/Cli.php
index b3969a36e..bcfc3e5a3 100644
--- a/lib/Doctrine/Cli.php
+++ b/lib/Doctrine/Cli.php
@@ -24,12 +24,7 @@
  *
  * Interface for easily executing Doctrine_Task classes from a command line interface
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 2761 $
  *
  * @author      Jonathan H. Wage <jwage@mac.com>
  */
@@ -114,8 +109,7 @@ public function getFormatter()
     /**
      * Returns the specified value from the config, or the default value, if specified.
      *
-     * @param string $name
-     *
+     * @param  string               $name
      * @throws OutOfBoundsException If the element does not exist in the config
      */
     public function getConfigValue($name/* , $defaultValue */)
@@ -142,7 +136,6 @@ public function getConfigValue($name/* , $defaultValue */)
      * @param string $name
      * @param mixed [$value=null]
      * @param bool [$strict=false]
-     *
      * @return bool
      */
     public function hasConfigValue($name, $value = null, $strict = false)
@@ -183,8 +176,7 @@ public function getRegisteredTasks()
     /**
      * Returns TRUE if the specified Task-class is registered, or FALSE otherwise.
      *
-     * @param string $className
-     *
+     * @param  string $className
      * @return bool
      */
     public function taskClassIsRegistered($className)
@@ -199,7 +191,6 @@ public function taskClassIsRegistered($className)
      *
      * @param string $taskName
      * @param string|null [&$className=null]
-     *
      * @return bool
      */
     public function taskNameIsRegistered($taskName, &$className = null)
@@ -280,10 +271,8 @@ protected function includeAndRegisterDoctrineTaskClasses($directories = null)
      * This means that a file called "Foo.php", say, will be expected to contain a Task class called
      * "Doctrine_Task_Foo".  Hence the method's name, "include*Doctrine*TaskClasses".
      *
-     * @param string $directory
-     *
-     * @return array $taskClassesIncluded
-     *
+     * @param  string                   $directory
+     * @return array                    $taskClassesIncluded
      * @throws InvalidArgumentException If the directory does not exist
      */
     protected function includeDoctrineTaskClasses($directory)
@@ -330,8 +319,7 @@ protected function includeDoctrineTaskClasses($directory)
     /**
      * Registers the specified _included_ task-class.
      *
-     * @param string $className
-     *
+     * @param  string                   $className
      * @throws InvalidArgumentException If the class does not exist or the task-name is blank
      * @throws DomainException          If the class is not a Doctrine Task
      */
@@ -356,8 +344,7 @@ public function registerTaskClass($className)
     /**
      * Returns TRUE if the specified class is a Task, or FALSE otherwise.
      *
-     * @param string $className
-     *
+     * @param  string $className
      * @return bool
      */
     protected function classIsTask($className)
@@ -372,9 +359,8 @@ protected function classIsTask($className)
      *
      * Displays a message, and returns FALSE, if there were problems instantiating the class
      *
-     * @param string $className
-     * @param object $cli       Doctrine_Cli
-     *
+     * @param  string $className
+     * @param  object $cli       Doctrine_Cli
      * @return object Doctrine_Task
      */
     protected function createTaskInstance($className, Doctrine_Cli $cli)
@@ -466,8 +452,7 @@ public function run(array $args)
     /**
      * Run the actual task execution with the passed arguments.
      *
-     * @param array $args Array of arguments for this task being executed
-     *
+     * @param  array                  $args Array of arguments for this task being executed
      * @throws Doctrine_Cli_Exception If the requested task has not been registered or if required arguments are missing
      *
      * @todo Continue refactoring for testing
@@ -502,8 +487,7 @@ protected function _run(array $args)
     /**
      * Executes the task with the specified _prepared_ arguments.
      *
-     * @param object $task Doctrine_Task
-     *
+     * @param  object                 $task Doctrine_Task
      * @throws Doctrine_Cli_Exception If required arguments are missing
      */
     protected function executeTask(Doctrine_Task $task, array $preparedArguments)
@@ -521,8 +505,7 @@ protected function executeTask(Doctrine_Task $task, array $preparedArguments)
      * Prepare the raw arguments for execution. Combines with the required and optional argument
      * list in order to determine a complete array of arguments for the task.
      *
-     * @param array $args Array of raw arguments
-     *
+     * @param  array $args Array of raw arguments
      * @return array $prepared  Array of prepared arguments
      *
      * @todo Continue refactoring for testing
@@ -607,8 +590,7 @@ public function printTasks($taskName = null, $full = false)
     }
 
     /**
-     * @param object $formatter Doctrine_Cli_Formatter
-     *
+     * @param  object $formatter Doctrine_Cli_Formatter
      * @return string
      */
     protected function assembleArgumentList(array $argumentsDescriptions, array $config, Doctrine_Cli_Formatter $formatter)
diff --git a/lib/Doctrine/Cli/AnsiColorFormatter.php b/lib/Doctrine/Cli/AnsiColorFormatter.php
index a443baa5a..aa8a020db 100644
--- a/lib/Doctrine/Cli/AnsiColorFormatter.php
+++ b/lib/Doctrine/Cli/AnsiColorFormatter.php
@@ -33,12 +33,8 @@
  *
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Jonathan H. Wage <jonwage@gmail.com>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 4252 $
  */
 class Doctrine_Cli_AnsiColorFormatter extends Doctrine_Cli_Formatter
 {
@@ -68,7 +64,6 @@ public function setStyle($name, $options = array())
      *
      * @param  string The test to style
      * @param  mixed  An array of options or a style name
-     *
      * @return string The styled text
      */
     public function format($text = '', $parameters = array(), $stream = STDOUT)
@@ -123,9 +118,8 @@ public function formatSection($section, $text, $size = null)
      *
      * @param string  The text
      * @param int The maximum size of the returned string (65 by default)
-     * @param mixed|null $size
-     *
-     * @return string The truncated string
+     * @param  mixed|null $size
+     * @return string     The truncated string
      */
     public function excerpt($text, $size = null)
     {
@@ -151,7 +145,6 @@ public function excerpt($text, $size = null)
      *  -  non tty consoles
      *
      * @param  mixed A stream
-     *
      * @return bool true if the stream supports colorization, false otherwise
      */
     public function supportsColors($stream)
diff --git a/lib/Doctrine/Cli/Exception.php b/lib/Doctrine/Cli/Exception.php
index 2f12ddf21..77a790f46 100644
--- a/lib/Doctrine/Cli/Exception.php
+++ b/lib/Doctrine/Cli/Exception.php
@@ -22,12 +22,7 @@
 /**
  * Cli exception class.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 2761 $
  *
  * @author      Jonathan H. Wage <jwage@mac.com>
  */
diff --git a/lib/Doctrine/Cli/Formatter.php b/lib/Doctrine/Cli/Formatter.php
index 486729ff3..6248e96ab 100644
--- a/lib/Doctrine/Cli/Formatter.php
+++ b/lib/Doctrine/Cli/Formatter.php
@@ -33,12 +33,8 @@
  *
  * @author      Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author      Jonathan H. Wage <jonwage@gmail.com>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 2761 $
  */
 class Doctrine_Cli_Formatter
 {
@@ -60,7 +56,6 @@ public function __construct($maxLineSize = 65)
      * @param  string The test to style
      * @param  mixed  An array of parameters
      * @param  stream A stream (default to STDOUT)
-     *
      * @return string The formatted text
      */
     public function format($text = '', $parameters = array(), $stream = STDOUT)
@@ -86,9 +81,8 @@ public function formatSection($section, $text, $size = null)
      *
      * @param string  The text
      * @param int The maximum size of the returned string (65 by default)
-     * @param mixed|null $size
-     *
-     * @return string The truncated string
+     * @param  mixed|null $size
+     * @return string     The truncated string
      */
     public function excerpt($text, $size = null)
     {
diff --git a/lib/Doctrine/Collection.php b/lib/Doctrine/Collection.php
index de96030ef..586bf46c2 100644
--- a/lib/Doctrine/Collection.php
+++ b/lib/Doctrine/Collection.php
@@ -23,12 +23,7 @@
  * Doctrine_Collection
  * Collection of Doctrine_Record objects.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7686 $
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
@@ -206,8 +201,7 @@ public function __unserialize($data)
     /**
      * Sets the key column for this collection.
      *
-     * @param string $column
-     *
+     * @param  string              $column
      * @return Doctrine_Collection $this
      */
     public function setKeyColumn($column)
@@ -341,8 +335,7 @@ public function remove($key)
     /**
      * Whether or not this collection contains a specified element.
      *
-     * @param mixed $key the key of the element
-     *
+     * @param  mixed $key the key of the element
      * @return bool
      */
     public function contains($key)
@@ -371,8 +364,7 @@ public function search(Doctrine_Record $record)
      *
      * Collection also maps referential information to newly created records
      *
-     * @param mixed $key the key of the element
-     *
+     * @param  mixed           $key the key of the element
      * @return Doctrine_Record return a specified record
      */
     public function get($key)
@@ -466,9 +458,8 @@ public function set($key, $record)
     /**
      * Adds a record to collection.
      *
-     * @param Doctrine_Record $record record to be added
-     * @param string          $key    optional key for the record
-     *
+     * @param  Doctrine_Record $record record to be added
+     * @param  string          $key    optional key for the record
      * @return bool
      */
     public function add($record, $key = null)
@@ -545,8 +536,7 @@ public function merge(Doctrine_Collection $coll)
     /**
      * Load all relationships or the named relationship passed.
      *
-     * @param mixed|null $name
-     *
+     * @param  mixed|null $name
      * @return bool
      */
     public function loadRelated($name = null)
@@ -730,10 +720,9 @@ public function toArray($deep = true, $prefixKey = false)
     /**
      * Build an array made up of the values from the 2 specified columns.
      *
-     * @param string $key
-     * @param string $value
-     *
-     * @return array $result
+     * @param  string $key
+     * @param  string $value
+     * @return array  $result
      */
     public function toKeyValueArray($key, $value)
     {
@@ -891,9 +880,8 @@ public function getInsertDiff()
     /**
      * Compares two records. To be used on _snapshot diffs using array_udiff.
      *
-     * @param Doctrine_Record $a
-     * @param Doctrine_Record $b
-     *
+     * @param  Doctrine_Record $a
+     * @param  Doctrine_Record $b
      * @return int
      */
     protected function compareRecords($a, $b)
@@ -909,8 +897,7 @@ protected function compareRecords($a, $b)
      * Saves all records of this collection and processes the
      * difference of the last snapshot and the current data.
      *
-     * @param Doctrine_Connection $conn optional connection parameter
-     *
+     * @param  Doctrine_Connection $conn optional connection parameter
      * @return Doctrine_Collection
      */
     public function save(Doctrine_Connection $conn = null, $processDiff = true)
@@ -945,8 +932,7 @@ public function save(Doctrine_Connection $conn = null, $processDiff = true)
      * Replaces all records of this collection and processes the
      * difference of the last snapshot and the current data.
      *
-     * @param Doctrine_Connection $conn optional connection parameter
-     *
+     * @param  Doctrine_Connection $conn optional connection parameter
      * @return Doctrine_Collection
      */
     public function replace(Doctrine_Connection $conn = null, $processDiff = true)
diff --git a/lib/Doctrine/Collection/Exception.php b/lib/Doctrine/Collection/Exception.php
index e71bc9a3c..3121fe2e6 100644
--- a/lib/Doctrine/Collection/Exception.php
+++ b/lib/Doctrine/Collection/Exception.php
@@ -22,12 +22,7 @@
 /**
  * Collection exception class.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7490 $
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
diff --git a/lib/Doctrine/Collection/Iterator.php b/lib/Doctrine/Collection/Iterator.php
index 9b3287a1d..cbad90744 100644
--- a/lib/Doctrine/Collection/Iterator.php
+++ b/lib/Doctrine/Collection/Iterator.php
@@ -23,12 +23,7 @@
  * Doctrine_Collection_Iterator
  * iterates through Doctrine_Collection.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7490 $
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
diff --git a/lib/Doctrine/Collection/Iterator/Expandable.php b/lib/Doctrine/Collection/Iterator/Expandable.php
index 1fbb941fb..54ee0b5ac 100644
--- a/lib/Doctrine/Collection/Iterator/Expandable.php
+++ b/lib/Doctrine/Collection/Iterator/Expandable.php
@@ -22,12 +22,7 @@
 /**
  * Expandable collection iterator class.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7490 $
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
diff --git a/lib/Doctrine/Collection/Iterator/Normal.php b/lib/Doctrine/Collection/Iterator/Normal.php
index 498bc490d..17d98af0d 100644
--- a/lib/Doctrine/Collection/Iterator/Normal.php
+++ b/lib/Doctrine/Collection/Iterator/Normal.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Collection_Iterator_Normal.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7490 $
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
diff --git a/lib/Doctrine/Collection/Iterator/Offset.php b/lib/Doctrine/Collection/Iterator/Offset.php
index 8b8a16bfc..1a80465bd 100644
--- a/lib/Doctrine/Collection/Iterator/Offset.php
+++ b/lib/Doctrine/Collection/Iterator/Offset.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Collection_Iterator_Normal.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7490 $
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
diff --git a/lib/Doctrine/Collection/Offset.php b/lib/Doctrine/Collection/Offset.php
index 51b332104..c9f2b7493 100644
--- a/lib/Doctrine/Collection/Offset.php
+++ b/lib/Doctrine/Collection/Offset.php
@@ -23,12 +23,7 @@
  * Doctrine_Collection_Offset
  * Collection of Doctrine_Record objects.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7490 $
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
diff --git a/lib/Doctrine/Collection/OnDemand.php b/lib/Doctrine/Collection/OnDemand.php
index 272eb0bdf..4c722a12f 100644
--- a/lib/Doctrine/Collection/OnDemand.php
+++ b/lib/Doctrine/Collection/OnDemand.php
@@ -23,12 +23,7 @@
  * Doctrine_Collection_OnDemand
  * iterates through Doctrine_Records hydrating one at a time.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.1
- *
- * @version     $Revision$
  *
  * @author      Geoff Davis <geoff.davis@gmedia.com.au>
  */
diff --git a/lib/Doctrine/Column.php b/lib/Doctrine/Column.php
index fde9d7206..a4269ba00 100644
--- a/lib/Doctrine/Column.php
+++ b/lib/Doctrine/Column.php
@@ -24,12 +24,8 @@
  * This class represents a database column.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
- * @version     $Revision: 7663 $
  *
  * @see        www.doctrine-project.org
- * @since       1.0
  */
 class Doctrine_Column extends Doctrine_Access implements IteratorAggregate, Countable
 {
@@ -113,8 +109,7 @@ public function getEnumValues()
     /**
      * Retrieves an enum value.
      *
-     * @param int $index
-     *
+     * @param  int    $index
      * @return string integer ($index) if not present
      */
     public function enumValue($index)
diff --git a/lib/Doctrine/Compiler.php b/lib/Doctrine/Compiler.php
index 07b5fec54..9e6e458cb 100644
--- a/lib/Doctrine/Compiler.php
+++ b/lib/Doctrine/Compiler.php
@@ -24,12 +24,8 @@
  * This class can be used for compiling the entire Doctrine framework into a single file.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpllicense.php LGPL
  *
  * @see        www.phpdoctrine.
- * @since       1.0
- *
- * @version     $Revision: 7677 $
  */
 class Doctrine_Compiler
 {
@@ -39,9 +35,7 @@ class Doctrine_Compiler
      * cases dozens of files) can improve performance by an order of magnitude.
      *
      * @param mixed|null $target
-     *
      * @return $target Path the compiled file was written to
-     *
      * @throws Doctrine_Compiler_Exception if something went wrong during the compile operation
      */
     public static function compile($target = null, $includedDrivers = array())
diff --git a/lib/Doctrine/Compiler/Exception.php b/lib/Doctrine/Compiler/Exception.php
index 1cd7aab89..4d18b8800 100644
--- a/lib/Doctrine/Compiler/Exception.php
+++ b/lib/Doctrine/Compiler/Exception.php
@@ -23,12 +23,8 @@
  * Doctrine_Compiler_Exception.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7490 $
  */
 class Doctrine_Compiler_Exception extends Doctrine_Exception
 {
diff --git a/lib/Doctrine/Configurable.php b/lib/Doctrine/Configurable.php
index 992745423..7c9371662 100644
--- a/lib/Doctrine/Configurable.php
+++ b/lib/Doctrine/Configurable.php
@@ -23,12 +23,7 @@
  * Doctrine_Configurable
  * the base for Doctrine_Table, Doctrine_Manager and Doctrine_Connection.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
@@ -171,9 +166,8 @@ public function getParam($name, $namespace = null)
      *
      * this method is the base of Doctrine dependency injection
      *
-     * @param string $template name of the class template
-     * @param string $class    name of the class to be bound
-     *
+     * @param  string                $template name of the class template
+     * @param  string                $class    name of the class to be bound
      * @return Doctrine_Configurable this object
      */
     public function setImpl($template, $class)
@@ -226,10 +220,9 @@ public function setEventListener($listener)
     /**
      * addRecordListener.
      *
-     * @param Doctrine_EventListener_Interface|Doctrine_Overloadable $listener
-     * @param mixed|null                                             $name
-     *
-     * @return Doctrine_Configurable this object
+     * @param  Doctrine_EventListener_Interface|Doctrine_Overloadable $listener
+     * @param  mixed|null                                             $name
+     * @return Doctrine_Configurable                                  this object
      */
     public function addRecordListener($listener, $name = null)
     {
@@ -263,9 +256,8 @@ public function getRecordListener()
     /**
      * setListener.
      *
-     * @param Doctrine_EventListener_Interface|Doctrine_Overloadable $listener
-     *
-     * @return Doctrine_Configurable this object
+     * @param  Doctrine_EventListener_Interface|Doctrine_Overloadable $listener
+     * @return Doctrine_Configurable                                  this object
      */
     public function setRecordListener($listener)
     {
@@ -282,10 +274,9 @@ public function setRecordListener($listener)
     /**
      * addListener.
      *
-     * @param Doctrine_EventListener_Interface|Doctrine_Overloadable $listener
-     * @param mixed|null                                             $name
-     *
-     * @return Doctrine_Configurable this object
+     * @param  Doctrine_EventListener_Interface|Doctrine_Overloadable $listener
+     * @param  mixed|null                                             $name
+     * @return Doctrine_Configurable                                  this object
      */
     public function addListener($listener, $name = null)
     {
@@ -319,9 +310,8 @@ public function getListener()
     /**
      * setListener.
      *
-     * @param Doctrine_EventListener_Interface|Doctrine_Overloadable $listener
-     *
-     * @return Doctrine_Configurable this object
+     * @param  Doctrine_EventListener_Interface|Doctrine_Overloadable $listener
+     * @return Doctrine_Configurable                                  this object
      */
     public function setListener($listener)
     {
diff --git a/lib/Doctrine/Connection.php b/lib/Doctrine/Connection.php
index 8e701404f..3e6de0c0f 100644
--- a/lib/Doctrine/Connection.php
+++ b/lib/Doctrine/Connection.php
@@ -44,12 +44,7 @@
  *    is divided into modules. For a full list of connection modules see
  *    Doctrine_Connection::$_modules
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  * @author      Lukas Smith <smith@pooteeweet.org> (MDB2 library)
@@ -334,8 +329,7 @@ public static function getSupportedDrivers()
      * @todo why check for >= 100? has this any special meaning when creating
      * attributes?
      *
-     * @param int $attribute
-     *
+     * @param  int  $attribute
      * @return bool
      */
     public function setAttribute($attribute, $value)
@@ -396,10 +390,8 @@ public function getDriverName()
      * @see Doctrine_Transaction
      * @see Doctrine_Connection::$modules       all availible modules
      *
-     * @param string $name the name of the module to get
-     *
-     * @return Doctrine_Connection_Module connection module
-     *
+     * @param  string                        $name the name of the module to get
+     * @return Doctrine_Connection_Module    connection module
      * @throws Doctrine_Connection_Exception if trying to get an unknown module
      */
     public function __get($name)
@@ -528,9 +520,8 @@ public function driverName($name)
     /**
      * supports.
      *
-     * @param string $feature the name of the feature
-     *
-     * @return bool whether or not this drivers supports given feature
+     * @param  string $feature the name of the feature
+     * @return bool   whether or not this drivers supports given feature
      */
     public function supports($feature)
     {
@@ -564,7 +555,6 @@ public function supports($feature)
      *                          the provided key fields
      *
      *                          this method will fail if no key fields are specified
-     *
      * @throws Doctrine_Connection_Exception if this driver doesn't support replace
      * @throws Doctrine_Connection_Exception if some of the key values was null
      * @throws Doctrine_Connection_Exception if there were no key fields
@@ -607,11 +597,9 @@ public function replace(Doctrine_Table $table, array $fields, array $keys)
     /**
      * deletes table row(s) matching the specified identifier.
      *
-     * @param string $table      The table to delete data from
-     * @param array  $identifier an associateve array containing identifier column-value pairs
-     *
-     * @return int The number of affected rows
-     *
+     * @param  string                        $table      The table to delete data from
+     * @param  array                         $identifier an associateve array containing identifier column-value pairs
+     * @return int                           The number of affected rows
      * @throws Doctrine_Connection_Exception if something went wrong at the database level
      */
     public function delete(Doctrine_Table $table, array $identifier)
@@ -632,10 +620,8 @@ public function delete(Doctrine_Table $table, array $identifier)
     /**
      * Updates table row(s) with specified data.
      *
-     * @param Doctrine_Table $table The table to insert data into
-     *
-     * @return int the number of affected rows. Boolean false if empty value array was given,
-     *
+     * @param  Doctrine_Table                $table The table to insert data into
+     * @return int                           the number of affected rows. Boolean false if empty value array was given,
      * @throws Doctrine_Connection_Exception if something went wrong at the database level
      */
     public function update(Doctrine_Table $table, array $fields, array $identifier)
@@ -667,9 +653,8 @@ public function update(Doctrine_Table $table, array $fields, array $identifier)
     /**
      * Inserts a table row with specified data.
      *
-     * @param Doctrine_Table $table the table to insert data into
-     *
-     * @return int the number of affected rows. Boolean false if empty value array was given,
+     * @param  Doctrine_Table $table the table to insert data into
+     * @return int            the number of affected rows. Boolean false if empty value array was given,
      */
     public function insert(Doctrine_Table $table, array $fields)
     {
@@ -724,9 +709,8 @@ public function insert(Doctrine_Table $table, array $fields)
      * InterBase doesn't seem to be able to use delimited identifiers
      * via PHP 4.  They work fine under PHP 5.
      *
-     * @param string $str         identifier name to be quoted
-     * @param bool   $checkOption check the 'quote_identifier' option
-     *
+     * @param  string $str         identifier name to be quoted
+     * @param  bool   $checkOption check the 'quote_identifier' option
      * @return string quoted identifier string
      */
     public function quoteIdentifier($str, $checkOption = true)
@@ -746,9 +730,8 @@ public function quoteIdentifier($str, $checkOption = true)
      * quoteMultipleIdentifier
      * Quotes multiple identifier strings.
      *
-     * @param array $arr         identifiers array to be quoted
-     * @param bool  $checkOption check the 'quote_identifier' option
-     *
+     * @param  array  $arr         identifiers array to be quoted
+     * @param  bool   $checkOption check the 'quote_identifier' option
      * @return string quoted identifier string
      */
     public function quoteMultipleIdentifier($arr, $checkOption = true)
@@ -778,9 +761,8 @@ public function convertBooleans($item)
      * quote
      * quotes given input parameter.
      *
-     * @param mixed  $input parameter to be quoted
-     * @param string $type
-     *
+     * @param  mixed  $input parameter to be quoted
+     * @param  string $type
      * @return string
      */
     public function quote($input, $type = null)
@@ -801,9 +783,8 @@ public function setDateFormat($format = null)
     /**
      * fetchAll.
      *
-     * @param string $statement sql query to be executed
-     * @param array  $params    prepared statement params
-     *
+     * @param  string $statement sql query to be executed
+     * @param  array  $params    prepared statement params
      * @return array
      */
     public function fetchAll($statement, array $params = array())
@@ -826,9 +807,8 @@ public function fetchOne($statement, array $params = array(), $colnum = 0)
     /**
      * fetchRow.
      *
-     * @param string $statement sql query to be executed
-     * @param array  $params    prepared statement params
-     *
+     * @param  string $statement sql query to be executed
+     * @param  array  $params    prepared statement params
      * @return array
      */
     public function fetchRow($statement, array $params = array())
@@ -839,9 +819,8 @@ public function fetchRow($statement, array $params = array())
     /**
      * fetchArray.
      *
-     * @param string $statement sql query to be executed
-     * @param array  $params    prepared statement params
-     *
+     * @param  string $statement sql query to be executed
+     * @param  array  $params    prepared statement params
      * @return array
      */
     public function fetchArray($statement, array $params = array())
@@ -852,10 +831,9 @@ public function fetchArray($statement, array $params = array())
     /**
      * fetchColumn.
      *
-     * @param string $statement sql query to be executed
-     * @param array  $params    prepared statement params
-     * @param int    $colnum    0-indexed column number to retrieve
-     *
+     * @param  string $statement sql query to be executed
+     * @param  array  $params    prepared statement params
+     * @param  int    $colnum    0-indexed column number to retrieve
      * @return array
      */
     public function fetchColumn($statement, array $params = array(), $colnum = 0)
@@ -866,9 +844,8 @@ public function fetchColumn($statement, array $params = array(), $colnum = 0)
     /**
      * fetchAssoc.
      *
-     * @param string $statement sql query to be executed
-     * @param array  $params    prepared statement params
-     *
+     * @param  string $statement sql query to be executed
+     * @param  array  $params    prepared statement params
      * @return array
      */
     public function fetchAssoc($statement, array $params = array())
@@ -879,9 +856,8 @@ public function fetchAssoc($statement, array $params = array())
     /**
      * fetchBoth.
      *
-     * @param string $statement sql query to be executed
-     * @param array  $params    prepared statement params
-     *
+     * @param  string $statement sql query to be executed
+     * @param  array  $params    prepared statement params
      * @return array
      */
     public function fetchBoth($statement, array $params = array())
@@ -984,10 +960,9 @@ public function queryOne($query, array $params = array())
      * queries the database with limit and offset
      * added to the query and returns a Doctrine_Connection_Statement object.
      *
-     * @param string $query
-     * @param int    $limit
-     * @param int    $offset
-     *
+     * @param  string                        $query
+     * @param  int                           $limit
+     * @param  int                           $offset
      * @return Doctrine_Connection_Statement
      */
     public function select($query, $limit = 0, $offset = 0)
@@ -1002,9 +977,8 @@ public function select($query, $limit = 0, $offset = 0)
     /**
      * standaloneQuery.
      *
-     * @param string $query  sql query
-     * @param array  $params query parameters
-     *
+     * @param  string                                  $query  sql query
+     * @param  array                                   $params query parameters
      * @return PDOStatement|Doctrine_Adapter_Statement
      */
     public function standaloneQuery($query, $params = array())
@@ -1015,9 +989,8 @@ public function standaloneQuery($query, $params = array())
     /**
      * execute.
      *
-     * @param string $query  sql query
-     * @param array  $params query parameters
-     *
+     * @param  string                                  $query  sql query
+     * @param  array                                   $params query parameters
      * @return PDOStatement|Doctrine_Adapter_Statement
      */
     public function execute($query, array $params = array())
@@ -1052,9 +1025,8 @@ public function execute($query, array $params = array())
     /**
      * exec.
      *
-     * @param string $query  sql query
-     * @param array  $params query parameters
-     *
+     * @param  string $query  sql query
+     * @param  array  $params query parameters
      * @return int
      */
     public function exec($query, array $params = array())
@@ -1089,8 +1061,7 @@ public function exec($query, array $params = array())
     /**
      * rethrowException.
      *
-     * @param mixed|null $query
-     *
+     * @param  mixed|null                    $query
      * @throws Doctrine_Connection_Exception
      */
     public function rethrowException(Exception $e, $invoker, $query = null)
@@ -1133,8 +1104,7 @@ public function hasTable($name)
     /**
      * returns a table object for given component name.
      *
-     * @param string $name component name
-     *
+     * @param  string         $name component name
      * @return Doctrine_Table
      */
     public function getTable($name)
@@ -1218,8 +1188,7 @@ public function count()
      * addTable
      * adds a Doctrine_Table object into connection registry.
      *
-     * @param $table a Doctrine_Table object to be added into registry
-     *
+     * @param       $table a Doctrine_Table object to be added into registry
      * @return bool
      */
     public function addTable(Doctrine_Table $table)
@@ -1240,8 +1209,7 @@ public function addTable(Doctrine_Table $table)
      *
      * create                       creates a record
      *
-     * @param string $name component name
-     *
+     * @param  string          $name component name
      * @return Doctrine_Record Doctrine_Record object
      */
     public function create($name)
@@ -1432,10 +1400,8 @@ public function lastInsertId($table = null, $field = null)
      *
      * Listeners: onPreTransactionBegin, onTransactionBegin
      *
-     * @param string $savepoint name of a savepoint to set
-     *
-     * @return int current transaction nesting level
-     *
+     * @param  string                         $savepoint name of a savepoint to set
+     * @return int                            current transaction nesting level
      * @throws Doctrine_Transaction_Exception if the transaction fails at database level
      */
     public function beginTransaction($savepoint = null)
@@ -1456,10 +1422,8 @@ public function beginInternalTransaction($savepoint = null)
      *
      * Listeners: onPreTransactionCommit, onTransactionCommit
      *
-     * @param string $savepoint name of a savepoint to release
-     *
-     * @return bool false if commit couldn't be performed, true otherwise
-     *
+     * @param  string                         $savepoint name of a savepoint to release
+     * @return bool                           false if commit couldn't be performed, true otherwise
      * @throws Doctrine_Transaction_Exception if the transaction fails at PDO level
      * @throws Doctrine_Validator_Exception   if the transaction fails due to record validations
      */
@@ -1478,10 +1442,8 @@ public function commit($savepoint = null)
      * this method can be listened with onPreTransactionRollback and onTransactionRollback
      * eventlistener methods
      *
-     * @param string $savepoint name of a savepoint to rollback to
-     *
-     * @return bool false if rollback couldn't be performed, true otherwise
-     *
+     * @param  string                         $savepoint name of a savepoint to rollback to
+     * @return bool                           false if rollback couldn't be performed, true otherwise
      * @throws Doctrine_Transaction_Exception if the rollback operation fails at database level
      */
     public function rollback($savepoint = null)
@@ -1687,9 +1649,8 @@ public function __unserialize($data)
     /**
      * Get/generate a unique foreign key name for a relationship.
      *
-     * @param Doctrine_Relation $relation Relation object to generate the foreign key name for
-     *
-     * @return string $fkName
+     * @param  Doctrine_Relation $relation Relation object to generate the foreign key name for
+     * @return string            $fkName
      */
     public function generateUniqueRelationForeignKeyName(Doctrine_Relation $relation)
     {
@@ -1708,9 +1669,8 @@ public function generateUniqueRelationForeignKeyName(Doctrine_Relation $relation
     /**
      * Get/generate unique index name for a table name and set of fields.
      *
-     * @param string $tableName The name of the table the index exists
-     * @param string $fields    The fields that makes up the index
-     *
+     * @param  string $tableName The name of the table the index exists
+     * @param  string $fields    The fields that makes up the index
      * @return string $indexName    The name of the generated index
      */
     public function generateUniqueIndexName($tableName, $fields)
diff --git a/lib/Doctrine/Connection/Common.php b/lib/Doctrine/Connection/Common.php
index d63e53d7c..cc5c5261a 100644
--- a/lib/Doctrine/Connection/Common.php
+++ b/lib/Doctrine/Connection/Common.php
@@ -24,12 +24,6 @@
  *
  * @see        www.doctrine-project.org
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
- * @since       1.0
- *
- * @version     $Revision: 7490 $
- *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
 class Doctrine_Connection_Common extends Doctrine_Connection
@@ -37,8 +31,7 @@ class Doctrine_Connection_Common extends Doctrine_Connection
     /**
      * Adds an driver-specific LIMIT clause to the query.
      *
-     * @param string $query
-     *
+     * @param  string $query
      * @return string
      */
     public function modifyLimitQuery($query, $limit = false, $offset = false, $isManip = false)
diff --git a/lib/Doctrine/Connection/Db2.php b/lib/Doctrine/Connection/Db2.php
index dee23d4bc..7f554d381 100644
--- a/lib/Doctrine/Connection/Db2.php
+++ b/lib/Doctrine/Connection/Db2.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Connection_Db2.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7490 $
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
@@ -36,10 +31,9 @@ class Doctrine_Connection_Db2 extends Doctrine_Connection_Common
     /**
      * Adds an driver-specific LIMIT clause to the query.
      *
-     * @param string $query  query to modify
-     * @param int    $limit  limit the number of rows
-     * @param int    $offset start reading from given offset
-     *
+     * @param  string $query  query to modify
+     * @param  int    $limit  limit the number of rows
+     * @param  int    $offset start reading from given offset
      * @return string the modified query
      */
     public function modifyLimitQuery($query, $limit = false, $offset = false, $isManip = false)
diff --git a/lib/Doctrine/Connection/Exception.php b/lib/Doctrine/Connection/Exception.php
index 796a4b6f8..a489d9761 100644
--- a/lib/Doctrine/Connection/Exception.php
+++ b/lib/Doctrine/Connection/Exception.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Exception.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7490 $
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
@@ -73,7 +68,6 @@ class Doctrine_Connection_Exception extends Doctrine_Exception
 
     /**
      * @see Doctrine_Core::ERR_* constants
-     * @since 1.0
      *
      * @var int portable error code
      */
@@ -107,10 +101,9 @@ public function getPortableMessage()
      * @param   int|array   integer error code,
      *                           null to get the current error code-message map,
      *                           or an array with a new error code-message map
-     * @param mixed|null $value
-     *
-     * @return string error message, or false if the error code was
-     *                not recognized
+     * @param  mixed|null $value
+     * @return string     error message, or false if the error code was
+     *                    not recognized
      */
     public function errorMessage($value = null)
     {
@@ -123,12 +116,9 @@ public function errorMessage($value = null)
      * converted into a portable code and then adds this
      * portable error code to $portableCode field.
      *
-     * @param array $errorInfo error info array
-     *
-     * @since 1.0
-     *
-     * @return bool whether or not the error info processing was successfull
-     *              (the process is successfull if portable error code was found)
+     * @param  array $errorInfo error info array
+     * @return bool  whether or not the error info processing was successfull
+     *               (the process is successfull if portable error code was found)
      */
     public function processErrorInfo(array $errorInfo)
     {
diff --git a/lib/Doctrine/Connection/Mock.php b/lib/Doctrine/Connection/Mock.php
index 220059754..3acf13ba5 100644
--- a/lib/Doctrine/Connection/Mock.php
+++ b/lib/Doctrine/Connection/Mock.php
@@ -22,14 +22,10 @@
 /**
  * Doctrine_Connection_Mysql.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  * @author      Lukas Smith <smith@pooteeweet.org> (PEAR MDB2 library)
  *
- * @version     $Revision: 7490 $
- *
  * @see        www.doctrine-project.org
- * @since       1.0
  */
 class Doctrine_Connection_Mock extends Doctrine_Connection_Common
 {
diff --git a/lib/Doctrine/Connection/Module.php b/lib/Doctrine/Connection/Module.php
index d8b572c84..4ddb0e516 100644
--- a/lib/Doctrine/Connection/Module.php
+++ b/lib/Doctrine/Connection/Module.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Connection_Module.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7490 $
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
diff --git a/lib/Doctrine/Connection/Mssql.php b/lib/Doctrine/Connection/Mssql.php
index f83458983..be121fb0b 100644
--- a/lib/Doctrine/Connection/Mssql.php
+++ b/lib/Doctrine/Connection/Mssql.php
@@ -22,14 +22,10 @@
 /**
  * Doctrine_Connection_Mssql.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  * @author      Lukas Smith <smith@pooteeweet.org> (PEAR MDB2 library)
  *
- * @version     $Revision: 7690 $
- *
  * @see        www.doctrine-project.org
- * @since       1.0
  */
 class Doctrine_Connection_Mssql extends Doctrine_Connection_Common
 {
@@ -73,9 +69,8 @@ public function __construct(Doctrine_Manager $manager, $adapter)
      *
      * Quoting style depends on which database driver is being used.
      *
-     * @param string $identifier  identifier name to be quoted
-     * @param bool   $checkOption check the 'quote_identifier' option
-     *
+     * @param  string $identifier  identifier name to be quoted
+     * @param  bool   $checkOption check the 'quote_identifier' option
      * @return string quoted identifier string
      */
     public function quoteIdentifier($identifier, $checkOption = false)
@@ -194,9 +189,8 @@ private function parseOrderBy($orderby)
      *
      * @see DC-828
      *
-     * @param string $field
-     * @param string $term  the term which will changed if it's necessary, depending to the field type
-     *
+     * @param  string $field
+     * @param  string $term  the term which will changed if it's necessary, depending to the field type
      * @return string
      */
     public function modifyOrderByColumn(Doctrine_Table $table, $field, $term)
@@ -224,8 +218,7 @@ public function modifyLimitSubquery(Doctrine_Table $rootTable, $query, $limit =
     /**
      * return version information about the server.
      *
-     * @param bool $native determines if the raw version string should be returned
-     *
+     * @param  bool  $native determines if the raw version string should be returned
      * @return array version information
      */
     public function getServerVersion($native = false)
@@ -285,9 +278,8 @@ public function checkSequence($seqName)
     /**
      * execute.
      *
-     * @param string $query  sql query
-     * @param array  $params query parameters
-     *
+     * @param  string                                  $query  sql query
+     * @param  array                                   $params query parameters
      * @return PDOStatement|Doctrine_Adapter_Statement
      */
     public function execute($query, array $params = array())
@@ -302,9 +294,8 @@ public function execute($query, array $params = array())
     /**
      * execute.
      *
-     * @param string $query  sql query
-     * @param array  $params query parameters
-     *
+     * @param  string                                  $query  sql query
+     * @param  array                                   $params query parameters
      * @return PDOStatement|Doctrine_Adapter_Statement
      */
     public function exec($query, array $params = array())
@@ -340,9 +331,8 @@ protected function replaceBoundParamsWithInlineValuesInQuery($query, array $para
     /**
      * Inserts a table row with specified data.
      *
-     * @param Doctrine_Table $table the table to insert data into
-     *
-     * @return int the number of affected rows. Boolean false if empty value array was given,
+     * @param  Doctrine_Table $table the table to insert data into
+     * @return int            the number of affected rows. Boolean false if empty value array was given,
      */
     public function insert(Doctrine_Table $table, array $fields)
     {
diff --git a/lib/Doctrine/Connection/Mssql/Exception.php b/lib/Doctrine/Connection/Mssql/Exception.php
index 992713b30..6172792a5 100644
--- a/lib/Doctrine/Connection/Mssql/Exception.php
+++ b/lib/Doctrine/Connection/Mssql/Exception.php
@@ -22,14 +22,9 @@
 /**
  * Doctrine_Connection_Mssql_Exception.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  * @author      Lukas Smith <smith@pooteeweet.org> (PEAR MDB2 library)
  *
- * @since       1.0
- *
- * @version     $Revision: 7490 $
- *
  * @see        www.doctrine-project.org
  */
 class Doctrine_Connection_Mssql_Exception extends Doctrine_Connection_Exception
@@ -59,12 +54,9 @@ class Doctrine_Connection_Mssql_Exception extends Doctrine_Connection_Exception
      * converted into a portable code and then adds this
      * portable error code to $portableCode field.
      *
-     * @param array $errorInfo error info array
-     *
-     * @since 1.0
-     *
-     * @return bool whether or not the error info processing was successfull
-     *              (the process is successfull if portable error code was found)
+     * @param  array $errorInfo error info array
+     * @return bool  whether or not the error info processing was successfull
+     *               (the process is successfull if portable error code was found)
      */
     public function processErrorInfo(array $errorInfo)
     {
diff --git a/lib/Doctrine/Connection/Mysql.php b/lib/Doctrine/Connection/Mysql.php
index 89b22e5b0..b1c5bbbe5 100644
--- a/lib/Doctrine/Connection/Mysql.php
+++ b/lib/Doctrine/Connection/Mysql.php
@@ -22,14 +22,10 @@
 /**
  * Doctrine_Connection_Mysql.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  * @author      Lukas Smith <smith@pooteeweet.org> (PEAR MDB2 library)
  *
- * @version     $Revision: 7490 $
- *
  * @see        www.doctrine-project.org
- * @since       1.0
  */
 class Doctrine_Connection_Mysql extends Doctrine_Connection_Common
 {
@@ -190,7 +186,6 @@ public function setCharset($charset)
      *          part of unique index they may not be null.
      *
      *    Default: 0
-     *
      * @return int the number of affected rows
      */
     public function replace(Doctrine_Table $table, array $fields, array $keys)
diff --git a/lib/Doctrine/Connection/Mysql/Exception.php b/lib/Doctrine/Connection/Mysql/Exception.php
index a4b2b7b3f..9887bcc8c 100644
--- a/lib/Doctrine/Connection/Mysql/Exception.php
+++ b/lib/Doctrine/Connection/Mysql/Exception.php
@@ -22,14 +22,9 @@
 /**
  * Doctrine_Connection_Mysql_Exception.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  * @author      Lukas Smith <smith@pooteeweet.org> (PEAR MDB2 library)
  *
- * @since       1.0
- *
- * @version     $Revision: 7490 $
- *
  * @see        www.doctrine-project.org
  */
 class Doctrine_Connection_Mysql_Exception extends Doctrine_Connection_Exception
@@ -70,12 +65,9 @@ class Doctrine_Connection_Mysql_Exception extends Doctrine_Connection_Exception
      * converted into a portable code and then adds this
      * portable error code to $portableCode field.
      *
-     * @param array $errorInfo error info array
-     *
-     * @since 1.0
-     *
-     * @return bool whether or not the error info processing was successfull
-     *              (the process is successfull if portable error code was found)
+     * @param  array $errorInfo error info array
+     * @return bool  whether or not the error info processing was successfull
+     *               (the process is successfull if portable error code was found)
      */
     public function processErrorInfo(array $errorInfo)
     {
diff --git a/lib/Doctrine/Connection/Oracle.php b/lib/Doctrine/Connection/Oracle.php
index 7fecc2b52..4643feb92 100644
--- a/lib/Doctrine/Connection/Oracle.php
+++ b/lib/Doctrine/Connection/Oracle.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Connection_Oracle.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7664 $
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
@@ -85,10 +80,9 @@ public function setDateFormat($format = 'YYYY-MM-DD HH24:MI:SS')
     /**
      * Adds an driver-specific LIMIT clause to the query.
      *
-     * @param string $query  query to modify
-     * @param int    $limit  limit the number of rows
-     * @param int    $offset start reading from given offset
-     *
+     * @param  string $query  query to modify
+     * @param  int    $limit  limit the number of rows
+     * @param  int    $offset start reading from given offset
      * @return string the modified query
      */
     public function modifyLimitQuery($query, $limit = false, $offset = false, $isManip = false)
diff --git a/lib/Doctrine/Connection/Oracle/Exception.php b/lib/Doctrine/Connection/Oracle/Exception.php
index 77c1577f2..adcb3fa7d 100644
--- a/lib/Doctrine/Connection/Oracle/Exception.php
+++ b/lib/Doctrine/Connection/Oracle/Exception.php
@@ -22,14 +22,9 @@
 /**
  * Doctrine_Connection_Oracle_Exception.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  * @author      Lukas Smith <smith@pooteeweet.org> (PEAR MDB2 library)
  *
- * @since       1.0
- *
- * @version     $Revision: 7490 $
- *
  * @see        www.doctrine-project.org
  */
 class Doctrine_Connection_Oracle_Exception extends Doctrine_Connection_Exception
@@ -64,12 +59,9 @@ class Doctrine_Connection_Oracle_Exception extends Doctrine_Connection_Exception
      * converted into a portable code and then adds this
      * portable error code to $portableCode field.
      *
-     * @param array $errorInfo error info array
-     *
-     * @since 1.0
-     *
-     * @return bool whether or not the error info processing was successfull
-     *              (the process is successfull if portable error code was found)
+     * @param  array $errorInfo error info array
+     * @return bool  whether or not the error info processing was successfull
+     *               (the process is successfull if portable error code was found)
      */
     public function processErrorInfo(array $errorInfo)
     {
diff --git a/lib/Doctrine/Connection/Pgsql.php b/lib/Doctrine/Connection/Pgsql.php
index 0fa53589c..ac502a608 100644
--- a/lib/Doctrine/Connection/Pgsql.php
+++ b/lib/Doctrine/Connection/Pgsql.php
@@ -22,14 +22,10 @@
 /**
  * Doctrine_Connection_Pgsql.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  * @author      Lukas Smith <smith@pooteeweet.org> (PEAR MDB2 library)
  *
- * @version     $Revision: 7490 $
- *
  * @see        www.doctrine-project.org
- * @since       1.0
  */
 class Doctrine_Connection_Pgsql extends Doctrine_Connection_Common
 {
@@ -117,11 +113,10 @@ public function convertBooleans($item)
     /**
      * Changes a query string for various DBMS specific reasons.
      *
-     * @param string $query   query to modify
-     * @param int    $limit   limit the number of rows
-     * @param int    $offset  start reading from given offset
-     * @param bool   $isManip if the query is a DML query
-     *
+     * @param  string $query   query to modify
+     * @param  int    $limit   limit the number of rows
+     * @param  int    $offset  start reading from given offset
+     * @param  bool   $isManip if the query is a DML query
      * @return string modified query
      */
     public function modifyLimitQuery($query, $limit = false, $offset = false, $isManip = false)
@@ -155,8 +150,7 @@ public function modifyLimitQuery($query, $limit = false, $offset = false, $isMan
     /**
      * return version information about the server.
      *
-     * @param string $native determines if the raw version string should be returned
-     *
+     * @param  string       $native determines if the raw version string should be returned
      * @return array|string an array or string with version information
      */
     public function getServerVersion($native = false)
@@ -195,9 +189,8 @@ public function getServerVersion($native = false)
     /**
      * Inserts a table row with specified data.
      *
-     * @param Doctrine_Table $table the table to insert data into
-     *
-     * @return int the number of affected rows. Boolean false if empty value array was given,
+     * @param  Doctrine_Table $table the table to insert data into
+     * @return int            the number of affected rows. Boolean false if empty value array was given,
      */
     public function insert(Doctrine_Table $table, array $fields)
     {
diff --git a/lib/Doctrine/Connection/Pgsql/Exception.php b/lib/Doctrine/Connection/Pgsql/Exception.php
index 011c2804e..62cfd3c1e 100644
--- a/lib/Doctrine/Connection/Pgsql/Exception.php
+++ b/lib/Doctrine/Connection/Pgsql/Exception.php
@@ -22,17 +22,11 @@
 /**
  * Doctrine_Connection_Pgsql_Exception.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  * @author      Paul Cooper <pgc@ucecom.com> (PEAR MDB2 Pgsql driver)
  * @author      Lukas Smith <smith@pooteeweet.org> (PEAR MDB2 library)
- *
- * @since       1.0
- *
- * @version     $Revision: 7490 $
  */
 class Doctrine_Connection_Pgsql_Exception extends Doctrine_Connection_Exception
 {
@@ -72,7 +66,6 @@ class Doctrine_Connection_Pgsql_Exception extends Doctrine_Connection_Exception
      *
      * @param array $errorInfo error info array
      *
-     * @since 1.0
      * @see Doctrine_Core::ERR_* constants
      * @see Doctrine_Connection::$portableCode
      *
diff --git a/lib/Doctrine/Connection/Profiler.php b/lib/Doctrine/Connection/Profiler.php
index db4aec2aa..4226ff37f 100644
--- a/lib/Doctrine/Connection/Profiler.php
+++ b/lib/Doctrine/Connection/Profiler.php
@@ -23,12 +23,8 @@
  * Doctrine_Connection_Profiler.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  */
 class Doctrine_Connection_Profiler implements Doctrine_Overloadable, IteratorAggregate, Countable
 {
diff --git a/lib/Doctrine/Connection/Profiler/Exception.php b/lib/Doctrine/Connection/Profiler/Exception.php
index d446f08b1..8ae6ef395 100644
--- a/lib/Doctrine/Connection/Profiler/Exception.php
+++ b/lib/Doctrine/Connection/Profiler/Exception.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Connection_Profiler_Exception.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 1345 $
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
diff --git a/lib/Doctrine/Connection/Sqlite.php b/lib/Doctrine/Connection/Sqlite.php
index 1eb38a57b..efa8f155f 100644
--- a/lib/Doctrine/Connection/Sqlite.php
+++ b/lib/Doctrine/Connection/Sqlite.php
@@ -22,14 +22,10 @@
 /**
  * Doctrine_Connection_Sqlite.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  * @author      Lukas Smith <smith@pooteeweet.org> (PEAR MDB2 library)
  *
- * @version     $Revision: 7490 $
- *
  * @see        www.doctrine-project.org
- * @since       1.0
  */
 class Doctrine_Connection_Sqlite extends Doctrine_Connection_Common
 {
diff --git a/lib/Doctrine/Connection/Sqlite/Exception.php b/lib/Doctrine/Connection/Sqlite/Exception.php
index 658c7c2ad..9067e747b 100644
--- a/lib/Doctrine/Connection/Sqlite/Exception.php
+++ b/lib/Doctrine/Connection/Sqlite/Exception.php
@@ -22,14 +22,9 @@
 /**
  * Doctrine_Connection_Sqlite_Exception.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  * @author      Lukas Smith <smith@pooteeweet.org> (PEAR MDB2 library)
  *
- * @since       1.0
- *
- * @version     $Revision: 7490 $
- *
  * @see        www.doctrine-project.org
  */
 class Doctrine_Connection_Sqlite_Exception extends Doctrine_Connection_Exception
@@ -60,7 +55,6 @@ class Doctrine_Connection_Sqlite_Exception extends Doctrine_Connection_Exception
      *
      * @param array $errorInfo error info array
      *
-     * @since 1.0
      * @see Doctrine_Core::ERR_* constants
      * @see Doctrine_Connection::$portableCode
      *
diff --git a/lib/Doctrine/Connection/Statement.php b/lib/Doctrine/Connection/Statement.php
index 8a1a5afc5..330f8efb5 100644
--- a/lib/Doctrine/Connection/Statement.php
+++ b/lib/Doctrine/Connection/Statement.php
@@ -23,12 +23,8 @@
  * Doctrine_Connection_Statement.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 1532 $
  */
 class Doctrine_Connection_Statement implements Doctrine_Adapter_Statement_Interface
 {
@@ -94,13 +90,12 @@ public function getQuery()
      * bindColumn
      * Bind a column to a PHP variable.
      *
-     * @param mixed  $column Number of the column (1-indexed) or name of the column in the result set.
-     *                       If using the column name, be aware that the name should match
-     *                       the case of the column, as returned by the driver.
-     * @param string $param  name of the PHP variable to which the column will be bound
-     * @param int    $type   data type of the parameter, specified by the Doctrine_Core::PARAM_* constants
-     *
-     * @return bool Returns TRUE on success or FALSE on failure
+     * @param  mixed  $column Number of the column (1-indexed) or name of the column in the result set.
+     *                        If using the column name, be aware that the name should match
+     *                        the case of the column, as returned by the driver.
+     * @param  string $param  name of the PHP variable to which the column will be bound
+     * @param  int    $type   data type of the parameter, specified by the Doctrine_Core::PARAM_* constants
+     * @return bool   Returns TRUE on success or FALSE on failure
      */
     public function bindColumn($column, $param, $type = null)
     {
@@ -116,13 +111,12 @@ public function bindColumn($column, $param, $type = null)
      * Binds a value to a corresponding named or question mark
      * placeholder in the SQL statement that was use to prepare the statement.
      *
-     * @param mixed $param Parameter identifier. For a prepared statement using named placeholders,
-     *                     this will be a parameter name of the form :name. For a prepared statement
-     *                     using question mark placeholders, this will be the 1-indexed position of the parameter
-     * @param mixed $value the value to bind to the parameter
-     * @param int   $type  explicit data type for the parameter using the Doctrine_Core::PARAM_* constants
-     *
-     * @return bool returns TRUE on success or FALSE on failure
+     * @param  mixed $param Parameter identifier. For a prepared statement using named placeholders,
+     *                      this will be a parameter name of the form :name. For a prepared statement
+     *                      using question mark placeholders, this will be the 1-indexed position of the parameter
+     * @param  mixed $value the value to bind to the parameter
+     * @param  int   $type  explicit data type for the parameter using the Doctrine_Core::PARAM_* constants
+     * @return bool  returns TRUE on success or FALSE on failure
      */
     public function bindValue($param, $value, $type = null)
     {
@@ -145,14 +139,13 @@ public function bindValue($param, $value, $type = null)
      * of stored procedures that return data as output parameters, and some also as input/output
      * parameters that both send in data and are updated to receive it.
      *
-     * @param mixed $variable name of the PHP variable to bind to the SQL statement parameter
-     * @param int   $type     Explicit data type for the parameter using the Doctrine_Core::PARAM_* constants. To return
-     *                        an INOUT parameter from a stored procedure, use the bitwise OR operator to set the
-     *                        Doctrine_Core::PARAM_INPUT_OUTPUT bits for the data_type parameter.
-     * @param int   $length   Length of the data type. To indicate that a parameter is an OUT parameter
-     *                        from a stored procedure, you must explicitly set the length.
-     *
-     * @return bool returns TRUE on success or FALSE on failure
+     * @param  mixed $variable name of the PHP variable to bind to the SQL statement parameter
+     * @param  int   $type     Explicit data type for the parameter using the Doctrine_Core::PARAM_* constants. To return
+     *                         an INOUT parameter from a stored procedure, use the bitwise OR operator to set the
+     *                         Doctrine_Core::PARAM_INPUT_OUTPUT bits for the data_type parameter.
+     * @param  int   $length   Length of the data type. To indicate that a parameter is an OUT parameter
+     *                         from a stored procedure, you must explicitly set the length.
+     * @return bool  returns TRUE on success or FALSE on failure
      */
     public function bindParam($column, &$variable, $type = null, $length = null, $driverOptions = array())
     {
@@ -223,10 +216,9 @@ public function errorInfo()
      * if any, of their associated parameter markers or pass an array of input-only
      * parameter values
      *
-     * @param array $params an array of values with as many elements as there are
-     *                      bound parameters in the SQL statement being executed
-     *
-     * @return bool returns TRUE on success or FALSE on failure
+     * @param  array $params an array of values with as many elements as there are
+     *                       bound parameters in the SQL statement being executed
+     * @return bool  returns TRUE on success or FALSE on failure
      */
     public function execute($params = array())
     {
@@ -334,12 +326,11 @@ public function fetch(
      * fetchAll
      * Returns an array containing all of the result set rows.
      *
-     * @param int $fetchMode   Controls how the next row will be returned to the caller.
-     *                         This value must be one of the Doctrine_Core::FETCH_* constants,
-     *                         defaulting to Doctrine_Core::FETCH_BOTH
-     * @param int $columnIndex Returns the indicated 0-indexed column when the value of $fetchStyle is
-     *                         Doctrine_Core::FETCH_COLUMN. Defaults to 0.
-     *
+     * @param  int   $fetchMode   Controls how the next row will be returned to the caller.
+     *                            This value must be one of the Doctrine_Core::FETCH_* constants,
+     *                            defaulting to Doctrine_Core::FETCH_BOTH
+     * @param  int   $columnIndex Returns the indicated 0-indexed column when the value of $fetchStyle is
+     *                            Doctrine_Core::FETCH_COLUMN. Defaults to 0.
      * @return array
      */
     public function fetchAll(
@@ -372,10 +363,9 @@ public function fetchAll(
      * Returns a single column from the next row of a
      * result set or FALSE if there are no more rows.
      *
-     * @param int $columnIndex 0-indexed number of the column you wish to retrieve from the row. If no
-     *                         value is supplied, Doctrine_Adapter_Statement_Interface->fetchColumn()
-     *                         fetches the first column.
-     *
+     * @param  int    $columnIndex 0-indexed number of the column you wish to retrieve from the row. If no
+     *                             value is supplied, Doctrine_Adapter_Statement_Interface->fetchColumn()
+     *                             fetches the first column.
      * @return string returns a single column in the next row of a result set
      */
     public function fetchColumn($columnIndex = 0)
@@ -390,11 +380,10 @@ public function fetchColumn($columnIndex = 0)
      * Fetches the next row and returns it as an object. This function is an alternative to
      * Doctrine_Adapter_Statement_Interface->fetch() with Doctrine_Core::FETCH_CLASS or Doctrine_Core::FETCH_OBJ style.
      *
-     * @param string $className name of the created class, defaults to stdClass
-     * @param array  $args      elements of this array are passed to the constructor
-     *
-     * @return mixed an instance of the required class with property names that correspond
-     *               to the column names or FALSE in case of an error
+     * @param  string $className name of the created class, defaults to stdClass
+     * @param  array  $args      elements of this array are passed to the constructor
+     * @return mixed  an instance of the required class with property names that correspond
+     *                to the column names or FALSE in case of an error
      */
     public function fetchObject($className = 'stdClass', $args = array())
     {
@@ -420,8 +409,7 @@ public function getAttribute($attribute)
      * getColumnMeta
      * Returns metadata for a column in a result set.
      *
-     * @param int $column the 0-indexed column in the result set
-     *
+     * @param  int   $column the 0-indexed column in the result set
      * @return array Associative meta data array with the following structure:
      *
      *          native_type                 The PHP native type used to represent the column value.
@@ -474,10 +462,9 @@ public function rowCount()
      * setAttribute
      * Set a statement attribute.
      *
-     * @param int   $attribute
-     * @param mixed $value     the value of given attribute
-     *
-     * @return bool returns TRUE on success or FALSE on failure
+     * @param  int   $attribute
+     * @param  mixed $value     the value of given attribute
+     * @return bool  returns TRUE on success or FALSE on failure
      */
     public function setAttribute($attribute, $value)
     {
@@ -488,11 +475,10 @@ public function setAttribute($attribute, $value)
      * setFetchMode
      * Set the default fetch mode for this statement.
      *
-     * @param int        $mode the fetch mode must be one of the Doctrine_Core::FETCH_* constants
-     * @param mixed|null $arg1
-     * @param mixed|null $arg2
-     *
-     * @return bool returns 1 on success or FALSE on failure
+     * @param  int        $mode the fetch mode must be one of the Doctrine_Core::FETCH_* constants
+     * @param  mixed|null $arg1
+     * @param  mixed|null $arg2
+     * @return bool       returns 1 on success or FALSE on failure
      */
     public function setFetchMode($mode, $arg1 = null, $arg2 = null)
     {
diff --git a/lib/Doctrine/Connection/UnitOfWork.php b/lib/Doctrine/Connection/UnitOfWork.php
index bdda47b5e..fbb0a359a 100644
--- a/lib/Doctrine/Connection/UnitOfWork.php
+++ b/lib/Doctrine/Connection/UnitOfWork.php
@@ -28,12 +28,7 @@
  *
  * Referential integrity is currently not always ensured.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7684 $
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  * @author      Roman Borschel <roman@code-factory.org>
@@ -284,8 +279,7 @@ private function _executeDeletions(array $deletions)
      * Builds the SQL condition to target multiple records who have a single-column
      * primary key.
      *
-     * @param int $numRecords the number of records that are going to be deleted
-     *
+     * @param  int    $numRecords the number of records that are going to be deleted
      * @return string The SQL condition "pk = ? OR pk = ? OR pk = ? ..."
      */
     private function _buildSqlSingleKeyCondition($columnNames, $numRecords)
@@ -298,8 +292,7 @@ private function _buildSqlSingleKeyCondition($columnNames, $numRecords)
     /**
      * Builds the SQL condition to target multiple records who have a composite primary key.
      *
-     * @param int $numRecords the number of records that are going to be deleted
-     *
+     * @param  int    $numRecords the number of records that are going to be deleted
      * @return string The SQL condition "(pk1 = ? AND pk2 = ?) OR (pk1 = ? AND pk2 = ?) ..."
      */
     private function _buildSqlCompositeKeyCondition($columnNames, $numRecords)
@@ -327,7 +320,6 @@ private function _buildSqlCompositeKeyCondition($columnNames, $numRecords)
      * make sure we have all of them.
      *
      * @param Doctrine_Record  the record for which the delete operation will be cascaded
-     *
      * @throws PDOException If something went wrong at database level
      */
     protected function _cascadeDelete(Doctrine_Record $record, array &$deletions)
@@ -508,9 +500,8 @@ public function saveAll()
     /**
      * updates given record.
      *
-     * @param Doctrine_Record $record record to be updated
-     *
-     * @return bool whether or not the update was successful
+     * @param  Doctrine_Record $record record to be updated
+     * @return bool            whether or not the update was successful
      */
     public function update(Doctrine_Record $record)
     {
@@ -645,8 +636,7 @@ public function processSingleInsert(Doctrine_Record $record)
      * 'correct' order. Basically this means that the records of those
      * components can be saved safely in the order specified by the returned array.
      *
-     * @param array $tables an array of Doctrine_Table objects or component names
-     *
+     * @param  array $tables an array of Doctrine_Table objects or component names
      * @return array an array of component names in flushing order
      */
     public function buildFlushTree(array $tables)
diff --git a/lib/Doctrine/Core.php b/lib/Doctrine/Core.php
index 4674e8aa8..99ef76188 100644
--- a/lib/Doctrine/Core.php
+++ b/lib/Doctrine/Core.php
@@ -24,12 +24,8 @@
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  * @author      Lukas Smith <smith@pooteeweet.org> (PEAR MDB2 library)
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  */
 class Doctrine_Core
 {
@@ -727,9 +723,8 @@ public static function loadModels($directory, $modelLoading = null, $classPrefix
      * If you do not specify $classes it will return all of the currently loaded Doctrine_Records
      *
      * @param classes  Array of classes to filter through, otherwise uses get_declared_classes()
-     * @param mixed|null $classes
-     *
-     * @return array $loadedModels
+     * @param  mixed|null $classes
+     * @return array      $loadedModels
      */
     public static function getLoadedModels($classes = null)
     {
@@ -747,9 +742,8 @@ public static function getLoadedModels($classes = null)
      * the models generated by Doctrine generators and add them to the $models
      * array.
      *
-     * @param string $models
-     *
-     * @return array $models
+     * @param  string $models
+     * @return array  $models
      */
     public static function initializeModels($models)
     {
@@ -783,7 +777,6 @@ public static function initializeModels($models)
      * This will inflect the class, causing it to be loaded in to memory.
      *
      * @param classes  Array of classes to filter through, otherwise uses get_declared_classes()
-     *
      * @return array $loadedModels
      */
     public static function filterInvalidModels($classes)
@@ -803,8 +796,7 @@ public static function filterInvalidModels($classes)
      * Checks if what is passed is a valid Doctrine_Record
      * Will load class in to memory in order to inflect it and find out information about the class.
      *
-     * @param mixed $class Can be a string named after the class, an instance of the class, or an instance of the class reflected
-     *
+     * @param  mixed $class Can be a string named after the class, an instance of the class, or an instance of the class reflected
      * @return bool
      */
     public static function isValidModelClass($class)
@@ -833,8 +825,7 @@ public static function isValidModelClass($class)
      * Get the connection object for a table by the actual table name
      * FIXME: I think this method is flawed because a individual connections could have the same table name.
      *
-     * @param string $tableName
-     *
+     * @param  string              $tableName
      * @return Doctrine_Connection
      */
     public static function getConnectionByTableName($tableName)
@@ -855,12 +846,10 @@ public static function getConnectionByTableName($tableName)
     /**
      * Method for importing existing schema to Doctrine_Record classes.
      *
-     * @param string $directory   Directory to write your models to
-     * @param array  $connections Array of connection names to generate models for
-     * @param array  $options     Array of options
-     *
+     * @param  string    $directory   Directory to write your models to
+     * @param  array     $connections Array of connection names to generate models for
+     * @param  array     $options     Array of options
      * @return bool
-     *
      * @throws Exception
      */
     public static function generateModelsFromDb($directory, array $connections = array(), array $options = array())
@@ -934,8 +923,7 @@ public static function createTablesFromArray($array)
     /**
      * Generate a array of sql for the passed array of models.
      *
-     * @param array $array
-     *
+     * @param  array $array
      * @return array $sql
      */
     public static function generateSqlFromArray($array)
@@ -947,8 +935,7 @@ public static function generateSqlFromArray($array)
      * Generate a sql string to create the tables from all loaded models
      * or the models found in the passed directory.
      *
-     * @param string $directory
-     *
+     * @param  string $directory
      * @return string $build  String of sql queries. One query per line
      */
     public static function generateSqlFromModels($directory = null)
@@ -1027,12 +1014,10 @@ public static function loadData($yamlPath, $append = false, $charset = 'UTF-8')
     /**
      * Migrate database to specified $to version. Migrates from current to latest if you do not specify.
      *
-     * @param string $migrationsPath Path to migrations directory which contains your migration classes
-     * @param string $to             version you wish to migrate to
-     *
-     * @return bool true
-     *
-     * @throws new Doctrine_Migration_Exception
+     * @param  string $migrationsPath Path to migrations directory which contains your migration classes
+     * @param  string $to             version you wish to migrate to
+     * @return bool   true
+     * @throws new    Doctrine_Migration_Exception
      */
     public static function migrate($migrationsPath, $to = null)
     {
@@ -1057,9 +1042,8 @@ public static function generateMigrationClass($className, $migrationsPath)
     /**
      * Generate a set of migration classes from an existing database.
      *
-     * @param string $migrationsPath
-     *
-     * @throws new Doctrine_Migration_Exception
+     * @param  string $migrationsPath
+     * @throws new    Doctrine_Migration_Exception
      */
     public static function generateMigrationsFromDb($migrationsPath)
     {
@@ -1086,11 +1070,10 @@ public static function generateMigrationsFromModels($migrationsPath, $modelsPath
      * Generate a set of migration classes by generating differences between two sets
      * of schema information.
      *
-     * @param string $migrationsPath Path to your Doctrine migration classes
-     * @param string $from           From schema information
-     * @param string $to             To schema information
-     *
-     * @return array $changes
+     * @param  string $migrationsPath Path to your Doctrine migration classes
+     * @param  string $from           From schema information
+     * @param  string $to             To schema information
+     * @return array  $changes
      */
     public static function generateMigrationsFromDiff($migrationsPath, $from, $to)
     {
@@ -1102,8 +1085,7 @@ public static function generateMigrationsFromDiff($migrationsPath, $from, $to)
     /**
      * Get the Doctrine_Table object for the passed model.
      *
-     * @param string $componentName
-     *
+     * @param  string         $componentName
      * @return Doctrine_Table
      */
     public static function getTable($componentName)
@@ -1116,9 +1098,8 @@ public static function getTable($componentName)
      * including the compiled file instead of multiple files (in worst
      * cases dozens of files) can improve performance by an order of magnitude.
      *
-     * @param string $target
-     * @param array  $includedDrivers
-     *
+     * @param  string             $target
+     * @param  array              $includedDrivers
      * @throws Doctrine_Exception
      */
     public static function compile($target = null, $includedDrivers = array())
@@ -1130,8 +1111,7 @@ public static function compile($target = null, $includedDrivers = array())
      * simple autoload function
      * returns true if the class was loaded, otherwise false.
      *
-     * @param string $className
-     *
+     * @param  string $className
      * @return bool
      */
     public static function autoload($className)
@@ -1187,8 +1167,7 @@ public static function modelsAutoload($className)
     /**
      * Load classes from the Doctrine extensions directory/path.
      *
-     * @param string $className
-     *
+     * @param  string $className
      * @return bool
      */
     public static function extensionsAutoload($className)
@@ -1217,10 +1196,9 @@ public static function extensionsAutoload($className)
     /**
      * dumps a given variable.
      *
-     * @param mixed  $var    a variable of any type
-     * @param bool   $output whether to output the content
-     * @param string $indent indention string
-     *
+     * @param  mixed       $var    a variable of any type
+     * @param  bool        $output whether to output the content
+     * @param  string      $indent indention string
      * @return void|string
      */
     public static function dump($var, $output = true, $indent = '')
diff --git a/lib/Doctrine/Data.php b/lib/Doctrine/Data.php
index 46cc8d210..06566cee6 100644
--- a/lib/Doctrine/Data.php
+++ b/lib/Doctrine/Data.php
@@ -26,12 +26,8 @@
  * Support formats are based on what formats are available in Doctrine_Parser such as yaml, xml, json, etc.
  *
  * @author      Jonathan H. Wage <jwage@mac.com>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 2552 $
  */
 class Doctrine_Data
 {
@@ -161,9 +157,8 @@ public function getModels()
      *
      * Set/Get whether or not to export individual files
      *
-     * @param mixed|null $bool
-     *
-     * @return bool $_exportIndividualFiles
+     * @param  mixed|null $bool
+     * @return bool       $_exportIndividualFiles
      */
     public function exportIndividualFiles($bool = null)
     {
diff --git a/lib/Doctrine/Data/Exception.php b/lib/Doctrine/Data/Exception.php
index 42cc76309..91a922f28 100644
--- a/lib/Doctrine/Data/Exception.php
+++ b/lib/Doctrine/Data/Exception.php
@@ -23,12 +23,8 @@
  * Doctrine_Data_Exception.
  *
  * @author      Jonathan H. Wage <jwage@mac.com>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 2552 $
  */
 class Doctrine_Data_Exception extends Doctrine_Exception
 {
diff --git a/lib/Doctrine/Data/Export.php b/lib/Doctrine/Data/Export.php
index 9966c05c1..53da48080 100644
--- a/lib/Doctrine/Data/Export.php
+++ b/lib/Doctrine/Data/Export.php
@@ -23,12 +23,8 @@
  * Doctrine_Data_Export.
  *
  * @author      Jonathan H. Wage <jwage@mac.com>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 2552 $
  */
 class Doctrine_Data_Export extends Doctrine_Data
 {
@@ -139,8 +135,7 @@ public function dumpData(array $data)
      *
      * Prepare the raw data to be exported with the parser
      *
-     * @param string $data
-     *
+     * @param  string $data
      * @return array
      */
     public function prepareData($data)
diff --git a/lib/Doctrine/Data/Import.php b/lib/Doctrine/Data/Import.php
index d3436c1c1..d836fc4af 100644
--- a/lib/Doctrine/Data/Import.php
+++ b/lib/Doctrine/Data/Import.php
@@ -23,12 +23,8 @@
  * Doctrine_Data_Import.
  *
  * @author      Jonathan H. Wage <jwage@mac.com>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 2552 $
  */
 class Doctrine_Data_Import extends Doctrine_Data
 {
@@ -169,12 +165,10 @@ protected function _buildNestedSetRows($className, $data)
      * Get the unsaved object for a specified row key and validate that it is the valid object class
      * for the passed record and relation name.
      *
-     * @param string $rowKey
-     * @param string $relationName
-     * @param string $referringRowKey
-     *
+     * @param  string                  $rowKey
+     * @param  string                  $relationName
+     * @param  string                  $referringRowKey
      * @return Doctrine_Record
-     *
      * @throws Doctrine_Data_Exception
      */
     protected function _getImportedObject($rowKey, Doctrine_Record $record, $relationName, $referringRowKey)
diff --git a/lib/Doctrine/DataDict.php b/lib/Doctrine/DataDict.php
index 25bca80a8..4a82f76f1 100644
--- a/lib/Doctrine/DataDict.php
+++ b/lib/Doctrine/DataDict.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_DataDict.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7490 $
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  * @author      Lukas Smith <smith@pooteeweet.org> (PEAR MDB2 library)
@@ -39,8 +34,7 @@ class Doctrine_DataDict extends Doctrine_Connection_Module
      * parses a literal boolean value and returns
      * proper sql equivalent.
      *
-     * @param string $value boolean value to be parsed
-     *
+     * @param  string $value boolean value to be parsed
      * @return string parsed boolean value
      */
     public function parseBoolean($value)
diff --git a/lib/Doctrine/DataDict/Exception.php b/lib/Doctrine/DataDict/Exception.php
index edfad298c..4e4efc3ba 100644
--- a/lib/Doctrine/DataDict/Exception.php
+++ b/lib/Doctrine/DataDict/Exception.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_DataDict_Exception.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7490 $
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
diff --git a/lib/Doctrine/DataDict/Mssql.php b/lib/Doctrine/DataDict/Mssql.php
index 762badac8..9a641b3b4 100644
--- a/lib/Doctrine/DataDict/Mssql.php
+++ b/lib/Doctrine/DataDict/Mssql.php
@@ -20,16 +20,12 @@
  */
 
 /**
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  * @author      Lukas Smith <smith@pooteeweet.org> (PEAR MDB2 library)
  * @author      Frank M. Kromann <frank@kromann.info> (PEAR MDB2 Mssql driver)
  * @author      David Coallier <davidc@php.net> (PEAR MDB2 Mssql driver)
  *
- * @version     $Revision: 7660 $
- *
  * @see        www.doctrine-project.org
- * @since       1.0
  */
 class Doctrine_DataDict_Mssql extends Doctrine_DataDict
 {
@@ -52,7 +48,6 @@ class Doctrine_DataDict_Mssql extends Doctrine_DataDict
      *      notnull
      *          Boolean flag that indicates whether this field is constrained
      *          to not be set to null.
-     *
      * @return string DBMS specific SQL code portion that should be used to
      *                declare the specified field
      */
@@ -123,8 +118,7 @@ public function getNativeDeclaration($field)
     /**
      * Maps a native array description of a field to a MDB2 datatype and length.
      *
-     * @param array $field native field description
-     *
+     * @param  array $field native field description
      * @return array containing the various possible types, length, sign, fixed
      */
     public function getPortableDeclaration($field)
@@ -240,7 +234,6 @@ public function getPortableDeclaration($field)
      *                       notnull
      *                        Boolean flag that indicates whether this field is
      *                        constrained to not be set to null.
-     *
      * @return string DBMS specific SQL code portion that should be used to
      *                declare the specified field
      */
diff --git a/lib/Doctrine/DataDict/Mysql.php b/lib/Doctrine/DataDict/Mysql.php
index 067a26171..f7b5f4ac5 100644
--- a/lib/Doctrine/DataDict/Mysql.php
+++ b/lib/Doctrine/DataDict/Mysql.php
@@ -20,14 +20,10 @@
  */
 
 /**
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  * @author      Lukas Smith <smith@pooteeweet.org> (PEAR MDB2 library)
  *
- * @version     $Revision: 7635 $
- *
  * @see        www.doctrine-project.org
- * @since       1.0
  */
 class Doctrine_DataDict_Mysql extends Doctrine_DataDict
 {
@@ -127,7 +123,6 @@ class Doctrine_DataDict_Mysql extends Doctrine_DataDict
      *      notnull
      *          Boolean flag that indicates whether this field is constrained
      *          to not be set to null.
-     *
      * @return string DBMS specific SQL code portion that should be used to
      *                declare the specified field
      */
@@ -269,8 +264,7 @@ public function getNativeDeclaration($field)
     /**
      * Maps a native array description of a field to a MDB2 datatype and length.
      *
-     * @param array $field native field description
-     *
+     * @param  array $field native field description
      * @return array containing the various possible types, length, sign, fixed
      */
     public function getPortableDeclaration(array $field)
@@ -461,8 +455,7 @@ public function getPortableDeclaration(array $field)
      * Obtain DBMS specific SQL code portion needed to set the CHARACTER SET
      * of a field declaration to be used in statements like CREATE TABLE.
      *
-     * @param string $charset name of the charset
-     *
+     * @param  string $charset name of the charset
      * @return string DBMS specific SQL code portion needed to set the CHARACTER SET
      *                of a field declaration
      */
@@ -475,8 +468,7 @@ public function getCharsetFieldDeclaration($charset)
      * Obtain DBMS specific SQL code portion needed to set the COLLATION
      * of a field declaration to be used in statements like CREATE TABLE.
      *
-     * @param string $collation name of the collation
-     *
+     * @param  string $collation name of the collation
      * @return string DBMS specific SQL code portion needed to set the COLLATION
      *                of a field declaration
      */
@@ -507,7 +499,6 @@ public function getCollationFieldDeclaration($collation)
      *                       notnull
      *                        Boolean flag that indicates whether this field is
      *                        constrained to not be set to null.
-     *
      * @return string DBMS specific SQL code portion that should be used to
      *                declare the specified field
      */
diff --git a/lib/Doctrine/DataDict/Oracle.php b/lib/Doctrine/DataDict/Oracle.php
index b7efae5f9..00fec49ff 100644
--- a/lib/Doctrine/DataDict/Oracle.php
+++ b/lib/Doctrine/DataDict/Oracle.php
@@ -20,13 +20,9 @@
  */
 
 /**
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  *
- * @version     $Revision: 7490 $
- *
  * @see        www.doctrine-project.org
- * @since       1.0
  */
 class Doctrine_DataDict_Oracle extends Doctrine_DataDict
 {
@@ -49,7 +45,6 @@ class Doctrine_DataDict_Oracle extends Doctrine_DataDict
      *      notnull
      *          Boolean flag that indicates whether this field is constrained
      *          to not be set to null.
-     *
      * @return string DBMS specific SQL code portion that should be used to
      *                declare the specified field
      */
@@ -129,10 +124,8 @@ public function getNativeDeclaration(array $field)
     /**
      * Maps a native array description of a field to a doctrine datatype and length.
      *
-     * @param array $field native field description
-     *
-     * @return array containing the various possible types, length, sign, fixed
-     *
+     * @param  array                              $field native field description
+     * @return array                              containing the various possible types, length, sign, fixed
      * @throws Doctrine_DataDict_Oracle_Exception
      */
     public function getPortableDeclaration(array $field)
diff --git a/lib/Doctrine/DataDict/Pgsql.php b/lib/Doctrine/DataDict/Pgsql.php
index c8a554bc5..5a47f08c0 100644
--- a/lib/Doctrine/DataDict/Pgsql.php
+++ b/lib/Doctrine/DataDict/Pgsql.php
@@ -20,15 +20,11 @@
  */
 
 /**
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  * @author      Paul Cooper <pgc@ucecom.com>
  * @author      Lukas Smith <smith@pooteeweet.org> (PEAR MDB2 library)
  *
- * @version     $Revision: 7641 $
- *
  * @see        www.doctrine-project.org
- * @since       1.0
  */
 class Doctrine_DataDict_Pgsql extends Doctrine_DataDict
 {
@@ -353,7 +349,6 @@ class Doctrine_DataDict_Pgsql extends Doctrine_DataDict
      *      notnull
      *          Boolean flag that indicates whether this field is constrained
      *          to not be set to null.
-     *
      * @return string DBMS specific SQL code portion that should be used to
      *                declare the specified field
      */
@@ -445,8 +440,7 @@ public function getNativeDeclaration(array $field)
     /**
      * Maps a native array description of a field to a portable Doctrine datatype and length.
      *
-     * @param array $field native field description
-     *
+     * @param  array $field native field description
      * @return array containing the various possible types, length, sign, fixed
      */
     public function getPortableDeclaration(array $field)
@@ -642,7 +636,6 @@ public function getPortableDeclaration(array $field)
      *       notnull
      *           Boolean flag that indicates whether this field is constrained
      *           to not be set to null.
-     *
      * @return string DBMS specific SQL code portion that should be used to
      *                declare the specified field
      */
@@ -686,8 +679,7 @@ public function getIntegerDeclaration($name, $field)
      * parses a literal boolean value and returns
      * proper sql equivalent.
      *
-     * @param string $value boolean value to be parsed
-     *
+     * @param  string $value boolean value to be parsed
      * @return string parsed boolean value
      */
     public function parseBoolean($value)
diff --git a/lib/Doctrine/DataDict/Sqlite.php b/lib/Doctrine/DataDict/Sqlite.php
index a4cef8016..d5b7bdf59 100644
--- a/lib/Doctrine/DataDict/Sqlite.php
+++ b/lib/Doctrine/DataDict/Sqlite.php
@@ -20,14 +20,10 @@
  */
 
 /**
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  * @author      Lukas Smith <smith@pooteeweet.org> (PEAR MDB2 library)
  *
- * @version     $Revision: 7490 $
- *
  * @see        www.doctrine-project.org
- * @since       1.0
  */
 class Doctrine_DataDict_Sqlite extends Doctrine_DataDict
 {
@@ -135,8 +131,7 @@ public function getNativeDeclaration(array $field)
     /**
      * Maps a native array description of a field to Doctrine datatype and length.
      *
-     * @param array $field native field description
-     *
+     * @param  array $field native field description
      * @return array containing the various possible types, length, sign, fixed
      */
     public function getPortableDeclaration(array $field)
@@ -295,7 +290,6 @@ public function getPortableDeclaration(array $field)
      *                       notnull
      *                        Boolean flag that indicates whether this field is
      *                        constrained to not be set to null.
-     *
      * @return string DBMS specific SQL code portion that should be used to
      *                declare the specified field
      */
diff --git a/lib/Doctrine/Event.php b/lib/Doctrine/Event.php
index af5a32faa..ef12ffcd3 100644
--- a/lib/Doctrine/Event.php
+++ b/lib/Doctrine/Event.php
@@ -23,12 +23,8 @@
  * Doctrine_Event.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  */
 class Doctrine_Event
 {
@@ -252,9 +248,8 @@ public function skipOperation()
      * setOption
      * sets the value of an option.
      *
-     * @param string $option the name of the option
-     * @param mixed  $value  the value of the given option
-     *
+     * @param  string         $option the name of the option
+     * @param  mixed          $value  the value of the given option
      * @return Doctrine_Event this object
      */
     public function __set($option, $value)
@@ -268,9 +263,8 @@ public function __set($option, $value)
      * setOption
      * sets the value of an option by reference.
      *
-     * @param string $option the name of the option
-     * @param mixed  $value  the value of the given option
-     *
+     * @param  string         $option the name of the option
+     * @param  mixed          $value  the value of the given option
      * @return Doctrine_Event this object
      */
     public function set($option, &$value)
diff --git a/lib/Doctrine/EventListener.php b/lib/Doctrine/EventListener.php
index 5b15e0c29..0bc908781 100644
--- a/lib/Doctrine/EventListener.php
+++ b/lib/Doctrine/EventListener.php
@@ -24,12 +24,8 @@
  *                            the empty methods allow child classes to only implement the methods they need to implement.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7490 $
  */
 class Doctrine_EventListener implements Doctrine_EventListener_Interface
 {
diff --git a/lib/Doctrine/EventListener/Chain.php b/lib/Doctrine/EventListener/Chain.php
index 468b9796d..910cc71e6 100644
--- a/lib/Doctrine/EventListener/Chain.php
+++ b/lib/Doctrine/EventListener/Chain.php
@@ -25,12 +25,8 @@
  * useful for having multiple listeners listening the events at the same time.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7490 $
  */
 class Doctrine_EventListener_Chain extends Doctrine_Access implements Doctrine_EventListener_Interface
 {
diff --git a/lib/Doctrine/EventListener/Exception.php b/lib/Doctrine/EventListener/Exception.php
index 4c463e852..ecc42990f 100644
--- a/lib/Doctrine/EventListener/Exception.php
+++ b/lib/Doctrine/EventListener/Exception.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_EventListener_Exception.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 1344 $
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
diff --git a/lib/Doctrine/EventListener/Interface.php b/lib/Doctrine/EventListener/Interface.php
index bc8488f18..c3c937949 100644
--- a/lib/Doctrine/EventListener/Interface.php
+++ b/lib/Doctrine/EventListener/Interface.php
@@ -24,12 +24,8 @@
  *                            the empty methods allow child classes to only implement the methods they need to implement.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7490 $
  */
 interface Doctrine_EventListener_Interface
 {
diff --git a/lib/Doctrine/Exception.php b/lib/Doctrine/Exception.php
index 84c10f097..6cedb2a57 100644
--- a/lib/Doctrine/Exception.php
+++ b/lib/Doctrine/Exception.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Exception.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7490 $
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
@@ -77,9 +72,8 @@ class Doctrine_Exception extends Exception
      * @param   int|array   integer error code,
      *                           null to get the current error code-message map,
      *                           or an array with a new error code-message map
-     * @param mixed|null $value
-     *
-     * @return string error message
+     * @param  mixed|null $value
+     * @return string     error message
      */
     public function errorMessage($value = null)
     {
diff --git a/lib/Doctrine/Export.php b/lib/Doctrine/Export.php
index 68d6b591a..22d0b60a2 100644
--- a/lib/Doctrine/Export.php
+++ b/lib/Doctrine/Export.php
@@ -24,12 +24,8 @@
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  * @author      Lukas Smith <smith@pooteeweet.org> (PEAR MDB2 library)
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7653 $
  */
 class Doctrine_Export extends Doctrine_Connection_Module
 {
@@ -71,8 +67,7 @@ public function dropDatabaseSql($database)
      * dropTableSql
      * drop an existing table.
      *
-     * @param string $table name of table that should be dropped from the database
-     *
+     * @param  string $table name of table that should be dropped from the database
      * @return string
      */
     public function dropTableSql($table)
@@ -105,9 +100,8 @@ public function dropIndex($table, $name)
     /**
      * dropIndexSql.
      *
-     * @param string $table name of table that should be used in method
-     * @param string $name  name of the index to be dropped
-     *
+     * @param  string $table name of table that should be used in method
+     * @param  string $name  name of the index to be dropped
      * @return string SQL that is used for dropping an index
      */
     public function dropIndexSql($table, $name)
@@ -148,8 +142,7 @@ public function dropForeignKey($table, $name)
      * drop existing sequence
      * (this method is implemented by the drivers).
      *
-     * @param string $sequenceName name of the sequence to be dropped
-     *
+     * @param  string                        $sequenceName name of the sequence to be dropped
      * @throws Doctrine_Connection_Exception if something fails at database level
      */
     public function dropSequence($sequenceName)
@@ -161,8 +154,7 @@ public function dropSequence($sequenceName)
      * dropSequenceSql
      * drop existing sequence.
      *
-     * @param string $sequenceName name of the sequence to be dropped
-     *
+     * @param  string                        $sequenceName name of the sequence to be dropped
      * @throws Doctrine_Connection_Exception if something fails at database level
      */
     public function dropSequenceSql($sequenceName)
@@ -193,29 +185,28 @@ public function createDatabaseSql($database)
     /**
      * create a new table.
      *
-     * @param string $name    Name of the database that should be created
-     * @param array  $fields  Associative array that contains the definition of each field of the new table
-     *                        The indexes of the array entries are the names of the fields of the table an
-     *                        the array entry values are associative arrays like those that are meant to be
-     *                        passed with the field definitions to get[Type]Declaration() functions.
-     *                        array(
-     *                        'id' => array(
-     *                        'type' => 'integer',
-     *                        'unsigned' => 1
-     *                        'notnull' => 1
-     *                        'default' => 0
-     *                        ),
-     *                        'name' => array(
-     *                        'type' => 'text',
-     *                        'length' => 12
-     *                        ),
-     *                        'password' => array(
-     *                        'type' => 'text',
-     *                        'length' => 12
-     *                        )
-     *                        );
-     * @param array  $options An associative array of table options:
-     *
+     * @param  string $name    Name of the database that should be created
+     * @param  array  $fields  Associative array that contains the definition of each field of the new table
+     *                         The indexes of the array entries are the names of the fields of the table an
+     *                         the array entry values are associative arrays like those that are meant to be
+     *                         passed with the field definitions to get[Type]Declaration() functions.
+     *                         array(
+     *                         'id' => array(
+     *                         'type' => 'integer',
+     *                         'unsigned' => 1
+     *                         'notnull' => 1
+     *                         'default' => 0
+     *                         ),
+     *                         'name' => array(
+     *                         'type' => 'text',
+     *                         'length' => 12
+     *                         ),
+     *                         'password' => array(
+     *                         'type' => 'text',
+     *                         'length' => 12
+     *                         )
+     *                         );
+     * @param  array  $options An associative array of table options:
      * @return string
      */
     public function createTableSql($name, array $fields, array $options = array())
@@ -302,15 +293,14 @@ public function createTable($name, array $fields, array $options = array())
     /**
      * create sequence.
      *
-     * @param string $seqName name of the sequence to be created
-     * @param string $start   start value of the sequence; default is 1
-     * @param array  $options An associative array of table options:
-     *                        array(
-     *                        'comment' => 'Foo',
-     *                        'charset' => 'utf8',
-     *                        'collate' => 'utf8_unicode_ci',
-     *                        );
-     *
+     * @param  string                        $seqName name of the sequence to be created
+     * @param  string                        $start   start value of the sequence; default is 1
+     * @param  array                         $options An associative array of table options:
+     *                                                array(
+     *                                                'comment' => 'Foo',
+     *                                                'charset' => 'utf8',
+     *                                                'collate' => 'utf8_unicode_ci',
+     *                                                );
      * @throws Doctrine_Connection_Exception if something fails at database level
      */
     public function createSequence($seqName, $start = 1, array $options = array())
@@ -322,17 +312,15 @@ public function createSequence($seqName, $start = 1, array $options = array())
      * return RDBMS specific create sequence statement
      * (this method is implemented by the drivers).
      *
-     * @param string $seqName name of the sequence to be created
-     * @param string $start   start value of the sequence; default is 1
-     * @param array  $options An associative array of table options:
-     *                        array(
-     *                        'comment' => 'Foo',
-     *                        'charset' => 'utf8',
-     *                        'collate' => 'utf8_unicode_ci',
-     *                        );
-     *
+     * @param  string                        $seqName name of the sequence to be created
+     * @param  string                        $start   start value of the sequence; default is 1
+     * @param  array                         $options An associative array of table options:
+     *                                                array(
+     *                                                'comment' => 'Foo',
+     *                                                'charset' => 'utf8',
+     *                                                'collate' => 'utf8_unicode_ci',
+     *                                                );
      * @return string
-     *
      * @throws Doctrine_Connection_Exception if something fails at database level
      */
     public function createSequenceSql($seqName, $start = 1, array $options = array())
@@ -484,9 +472,8 @@ public function createIndexSql($table, $name, array $definition)
     /**
      * createForeignKeySql.
      *
-     * @param string $table      name of the table on which the foreign key is to be created
-     * @param array  $definition associative array that defines properties of the foreign key to be created
-     *
+     * @param  string $table      name of the table on which the foreign key is to be created
+     * @param  array  $definition associative array that defines properties of the foreign key to be created
      * @return string
      */
     public function createForeignKeySql($table, array $definition)
@@ -499,9 +486,8 @@ public function createForeignKeySql($table, array $definition)
     /**
      * createForeignKey.
      *
-     * @param string $table      name of the table on which the foreign key is to be created
-     * @param array  $definition associative array that defines properties of the foreign key to be created
-     *
+     * @param  string $table      name of the table on which the foreign key is to be created
+     * @param  array  $definition associative array that defines properties of the foreign key to be created
      * @return string
      */
     public function createForeignKey($table, array $definition)
@@ -589,7 +575,6 @@ public function alterTableSql($name, array $changes, $check = false)
      *          Text value with the default COLLATION for this field.
      *      unique
      *          unique constraint
-     *
      * @return string
      */
     public function getFieldDeclarationList(array $fields)
@@ -635,7 +620,6 @@ public function getFieldDeclarationList(array $fields)
      *
      *      check
      *          column check constraint
-     *
      * @return string DBMS specific SQL code portion that should be used to
      *                declare the specified field
      */
@@ -677,8 +661,7 @@ public function getDeclaration($name, array $field)
      * Obtain DBMS specific SQL code portion needed to set a default value
      * declaration to be used in statements like CREATE TABLE.
      *
-     * @param array $field field definition array
-     *
+     * @param  array  $field field definition array
      * @return string DBMS specific SQL code portion needed to set a default value
      */
     public function getDefaultFieldDeclaration($field)
@@ -723,8 +706,7 @@ public function getNotNullFieldDeclaration(array $definition)
      * Obtain DBMS specific SQL code portion needed to set a CHECK constraint
      * declaration to be used in statements like CREATE TABLE.
      *
-     * @param array $definition check definition
-     *
+     * @param  array  $definition check definition
      * @return string DBMS specific SQL code portion needed to set a CHECK constraint
      */
     public function getCheckDeclaration(array $definition)
@@ -751,9 +733,8 @@ public function getCheckDeclaration(array $definition)
      * Obtain DBMS specific SQL code portion needed to set an index
      * declaration to be used in statements like CREATE TABLE.
      *
-     * @param string $name       name of the index
-     * @param array  $definition index definition
-     *
+     * @param  string $name       name of the index
+     * @param  array  $definition index definition
      * @return string DBMS specific SQL code portion needed to set an index
      */
     public function getIndexDeclaration($name, array $definition)
@@ -858,7 +839,6 @@ public function getTemporaryTableQuery()
      *           omitting the ON DELETE or ON UPDATE clause.
      *
      * SET DEFAULT
-     *
      * @return string DBMS specific SQL code portion needed to set the FOREIGN KEY constraint
      *                of a field declaration
      */
@@ -875,8 +855,7 @@ public function getForeignKeyDeclaration(array $definition)
      * Return the FOREIGN KEY query section dealing with non-standard options
      * as MATCH, INITIALLY DEFERRED, ON UPDATE, ...
      *
-     * @param array $definition foreign key definition
-     *
+     * @param  array  $definition foreign key definition
      * @return string
      */
     public function getAdvancedForeignKeyOptions(array $definition)
@@ -900,7 +879,6 @@ public function getAdvancedForeignKeyOptions(array $definition)
      *
      * @param string $action foreign key referential action
      * @param string            foreign key referential action in uppercase
-     *
      * @throws Doctrine_Exception_Exception if unknown referential action given
      */
     public function getForeignKeyReferentialAction($action)
@@ -975,8 +953,7 @@ public function getUniqueFieldDeclaration()
      * Obtain DBMS specific SQL code portion needed to set the CHARACTER SET
      * of a field declaration to be used in statements like CREATE TABLE.
      *
-     * @param string $charset name of the charset
-     *
+     * @param  string $charset name of the charset
      * @return string DBMS specific SQL code portion needed to set the CHARACTER SET
      *                of a field declaration
      */
@@ -989,8 +966,7 @@ public function getCharsetFieldDeclaration($charset)
      * Obtain DBMS specific SQL code portion needed to set the COLLATION
      * of a field declaration to be used in statements like CREATE TABLE.
      *
-     * @param string $collation name of the collation
-     *
+     * @param  string $collation name of the collation
      * @return string DBMS specific SQL code portion needed to set the COLLATION
      *                of a field declaration
      */
@@ -1009,8 +985,7 @@ public function getCollationFieldDeclaration($collation)
      * Then it iterates through all declared classes and creates tables for the ones
      * that extend Doctrine_Record and are not abstract classes
      *
-     * @param string $directory optional directory parameter
-     *
+     * @param  string                        $directory optional directory parameter
      * @throws Doctrine_Connection_Exception if some error other than Doctrine_Core::ERR_ALREADY_EXISTS
      *                                       occurred during the create table operation
      */
@@ -1209,9 +1184,8 @@ public function exportClassesSql(array $classes)
     /**
      * fetches all generators recursively for given table.
      *
-     * @param Doctrine_Table $table table object to retrieve the generators from
-     *
-     * @return array an array of Doctrine_Record_Generator objects
+     * @param  Doctrine_Table $table table object to retrieve the generators from
+     * @return array          an array of Doctrine_Record_Generator objects
      */
     public function getAllGenerators(Doctrine_Table $table)
     {
@@ -1238,9 +1212,8 @@ public function getAllGenerators(Doctrine_Table $table)
      * exportGeneratorsSql
      * exports plugin tables for given table.
      *
-     * @param Doctrine_Table $table the table in which the generators belong to
-     *
-     * @return array an array of sql strings
+     * @param  Doctrine_Table $table the table in which the generators belong to
+     * @return array          an array of sql strings
      */
     public function exportGeneratorsSql(Doctrine_Table $table)
     {
@@ -1272,8 +1245,7 @@ public function exportGeneratorsSql(Doctrine_Table $table)
      * Then it iterates through all declared classes and creates tables for the ones
      * that extend Doctrine_Record and are not abstract classes
      *
-     * @param string $directory optional directory parameter
-     *
+     * @param  string                        $directory optional directory parameter
      * @throws Doctrine_Connection_Exception if some error other than Doctrine_Core::ERR_ALREADY_EXISTS
      *                                       occurred during the create table operation
      */
@@ -1292,9 +1264,8 @@ public function exportSql($directory = null)
      * exportTable
      * exports given table into database based on column and option definitions.
      *
-     * @return bool whether or not the export operation was successful
-     *              false if table already existed in the database
-     *
+     * @return bool                          whether or not the export operation was successful
+     *                                       false if table already existed in the database
      * @throws Doctrine_Connection_Exception if some error other than Doctrine_Core::ERR_ALREADY_EXISTS
      *                                       occurred during the create table operation
      */
diff --git a/lib/Doctrine/Export/Exception.php b/lib/Doctrine/Export/Exception.php
index 7a3926ac7..1c29cf93c 100644
--- a/lib/Doctrine/Export/Exception.php
+++ b/lib/Doctrine/Export/Exception.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Export_Exception.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7490 $
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
diff --git a/lib/Doctrine/Export/Mssql.php b/lib/Doctrine/Export/Mssql.php
index 521813f18..448dc36f8 100644
--- a/lib/Doctrine/Export/Mssql.php
+++ b/lib/Doctrine/Export/Mssql.php
@@ -25,12 +25,8 @@
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  * @author      Lukas Smith <smith@pooteeweet.org> (PEAR MDB2 library)
  * @author      Frank M. Kromann <frank@kromann.info> (PEAR MDB2 Mssql driver)
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7660 $
  */
 class Doctrine_Export_Mssql extends Doctrine_Export
 {
@@ -263,15 +259,14 @@ public function alterTable($name, array $changes, $check = false)
     /**
      * create sequence.
      *
-     * @param string $seqName name of the sequence to be created
-     * @param string $start   start value of the sequence; default is 1
-     * @param array  $options An associative array of table options:
-     *                        array(
-     *                        'comment' => 'Foo',
-     *                        'charset' => 'utf8',
-     *                        'collate' => 'utf8_unicode_ci',
-     *                        );
-     *
+     * @param  string $seqName name of the sequence to be created
+     * @param  string $start   start value of the sequence; default is 1
+     * @param  array  $options An associative array of table options:
+     *                         array(
+     *                         'comment' => 'Foo',
+     *                         'charset' => 'utf8',
+     *                         'collate' => 'utf8_unicode_ci',
+     *                         );
      * @return string
      */
     public function createSequence($seqName, $start = 1, array $options = array())
@@ -313,29 +308,28 @@ public function dropSequenceSql($seqName)
     /**
      * create a new table.
      *
-     * @param string $name    Name of the database that should be created
-     * @param array  $fields  Associative array that contains the definition of each field of the new table
-     *                        The indexes of the array entries are the names of the fields of the table an
-     *                        the array entry values are associative arrays like those that are meant to be
-     *                        passed with the field definitions to get[Type]Declaration() functions.
-     *                        array(
-     *                        'id' => array(
-     *                        'type' => 'integer',
-     *                        'unsigned' => 1
-     *                        'notnull' => 1
-     *                        'default' => 0
-     *                        ),
-     *                        'name' => array(
-     *                        'type' => 'text',
-     *                        'length' => 12
-     *                        ),
-     *                        'password' => array(
-     *                        'type' => 'text',
-     *                        'length' => 12
-     *                        )
-     *                        );
-     * @param array  $options An associative array of table options:
-     *
+     * @param  string $name    Name of the database that should be created
+     * @param  array  $fields  Associative array that contains the definition of each field of the new table
+     *                         The indexes of the array entries are the names of the fields of the table an
+     *                         the array entry values are associative arrays like those that are meant to be
+     *                         passed with the field definitions to get[Type]Declaration() functions.
+     *                         array(
+     *                         'id' => array(
+     *                         'type' => 'integer',
+     *                         'unsigned' => 1
+     *                         'notnull' => 1
+     *                         'default' => 0
+     *                         ),
+     *                         'name' => array(
+     *                         'type' => 'text',
+     *                         'length' => 12
+     *                         ),
+     *                         'password' => array(
+     *                         'type' => 'text',
+     *                         'length' => 12
+     *                         )
+     *                         );
+     * @param  array  $options An associative array of table options:
      * @return string
      */
     public function createTableSql($name, array $fields, array $options = array())
@@ -421,8 +415,7 @@ public function getNotNullFieldDeclaration(array $definition)
     /**
      * @see Doctrine_Export::getDefaultFieldDeclaration
      *
-     * @param array $field field definition array
-     *
+     * @param  array  $field field definition array
      * @return string DBMS specific SQL code portion needed to set a default value
      */
     public function getDefaultFieldDeclaration($field)
diff --git a/lib/Doctrine/Export/Mysql.php b/lib/Doctrine/Export/Mysql.php
index c7be961f8..2bb73ce0c 100644
--- a/lib/Doctrine/Export/Mysql.php
+++ b/lib/Doctrine/Export/Mysql.php
@@ -24,12 +24,8 @@
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  * @author      Lukas Smith <smith@pooteeweet.org> (PEAR MDB2 library)
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7653 $
  */
 class Doctrine_Export_Mysql extends Doctrine_Export
 {
@@ -66,8 +62,7 @@ public function createDatabaseSql($name)
     /**
      * drop an existing database.
      *
-     * @param string $name name of the database that should be dropped
-     *
+     * @param  string $name name of the database that should be dropped
      * @return string
      */
     public function dropDatabaseSql($name)
@@ -252,7 +247,6 @@ public function createTableSql($name, array $fields, array $options = array())
      *          unique constraint
      *      check
      *          column check constraint
-     *
      * @return string DBMS specific SQL code portion that should be used to
      *                declare the specified field
      */
@@ -311,10 +305,9 @@ public function getDeclaration($name, array $field)
      *                                 should be set to another associative array with the properties
      *                                 of the fields to be added. The properties of the fields should
      *                                 be the same as defined by the Metabase parser.
-     * @param bool $check indicates whether the function should just check if the DBMS driver
-     *                    can perform the requested table alterations if the value is true or
-     *                    actually perform them otherwise
-     *
+     * @param  bool $check indicates whether the function should just check if the DBMS driver
+     *                     can perform the requested table alterations if the value is true or
+     *                     actually perform them otherwise
      * @return bool
      */
     public function alterTableSql($name, array $changes, $check = false)
@@ -412,16 +405,15 @@ public function alterTableSql($name, array $changes, $check = false)
     /**
      * create sequence.
      *
-     * @param string $sequenceName name of the sequence to be created
-     * @param string $start        start value of the sequence; default is 1
-     * @param array  $options      An associative array of table options:
-     *                             array(
-     *                             'comment' => 'Foo',
-     *                             'charset' => 'utf8',
-     *                             'collate' => 'utf8_unicode_ci',
-     *                             'type'    => 'innodb',
-     *                             );
-     *
+     * @param  string $sequenceName name of the sequence to be created
+     * @param  string $start        start value of the sequence; default is 1
+     * @param  array  $options      An associative array of table options:
+     *                              array(
+     *                              'comment' => 'Foo',
+     *                              'charset' => 'utf8',
+     *                              'collate' => 'utf8_unicode_ci',
+     *                              'type'    => 'innodb',
+     *                              );
      * @return bool
      */
     public function createSequence($sequenceName, $start = 1, array $options = array())
@@ -517,7 +509,6 @@ public function createSequence($sequenceName, $start = 1, array $options = array
      *                                            'last_login' => array()
      *                                        )
      *                                    )
-     *
      * @throws PDOException
      */
     public function createIndexSql($table, $name, array $definition)
@@ -549,8 +540,7 @@ public function createIndexSql($table, $name, array $definition)
      * Obtain DBMS specific SQL code portion needed to set a default value
      * declaration to be used in statements like CREATE TABLE.
      *
-     * @param array $field field definition array
-     *
+     * @param  array  $field field definition array
      * @return string DBMS specific SQL code portion needed to set a default value
      */
     public function getDefaultFieldDeclaration($field)
@@ -588,8 +578,7 @@ public function getDefaultFieldDeclaration($field)
      * Obtain DBMS specific SQL code portion needed to set an index
      * declaration to be used in statements like CREATE TABLE.
      *
-     * @param array $definition index definition
-     *
+     * @param  array  $definition index definition
      * @return string DBMS specific SQL code portion needed to set an index
      */
     public function getIndexDeclaration($name, array $definition)
@@ -663,8 +652,7 @@ public function getIndexFieldDeclarationList(array $fields)
     /**
      * Returns a character set declaration.
      *
-     * @param string $charset A character set
-     *
+     * @param  string $charset A character set
      * @return string A character set declaration
      */
     public function getCharsetFieldDeclaration($charset)
@@ -675,8 +663,7 @@ public function getCharsetFieldDeclaration($charset)
     /**
      * Returns a collation declaration.
      *
-     * @param string $collation A collation
-     *
+     * @param  string $collation A collation
      * @return string A collation declaration
      */
     public function getCollationFieldDeclaration($collation)
@@ -724,8 +711,7 @@ public function dropIndexSql($table, $name)
     /**
      * dropTable.
      *
-     * @param string $table name of table that should be dropped from the database
-     *
+     * @param  string       $table name of table that should be dropped from the database
      * @throws PDOException
      */
     public function dropTableSql($table)
diff --git a/lib/Doctrine/Export/Oracle.php b/lib/Doctrine/Export/Oracle.php
index 53a8802e4..bcee3d2ef 100644
--- a/lib/Doctrine/Export/Oracle.php
+++ b/lib/Doctrine/Export/Oracle.php
@@ -24,21 +24,16 @@
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  * @author      Lukas Smith <smith@pooteeweet.org> (PEAR MDB2 library)
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7490 $
  */
 class Doctrine_Export_Oracle extends Doctrine_Export
 {
     /**
      * create a new database.
      *
-     * @param string $name name of the database that should be created
-     *
-     * @return bool success of operation
+     * @param  string $name name of the database that should be created
+     * @return bool   success of operation
      */
     public function createDatabase($name)
     {
@@ -66,9 +61,8 @@ public function createDatabase($name)
     /**
      * drop an existing database.
      *
-     * @param string $name name of the database that should be dropped
-     *
-     * @return bool success of operation
+     * @param  string $name name of the database that should be dropped
+     * @return bool   success of operation
      */
     public function dropDatabase($name)
     {
@@ -99,10 +93,9 @@ public function dropDatabase($name)
     /**
      * add an autoincrement sequence + trigger.
      *
-     * @param string $name  name of the PK field
-     * @param string $table name of the table
-     * @param string $start start value for the sequence
-     *
+     * @param  string $name  name of the PK field
+     * @param  string $table name of the table
+     * @param  string $start start value for the sequence
      * @return string Sql code
      */
     public function _makeAutoincrement($name, $table, $start = 1)
@@ -212,8 +205,7 @@ public function getTemporaryTableQuery()
      * Return the FOREIGN KEY query section dealing with non-standard options
      * as MATCH, INITIALLY DEFERRED, ON UPDATE, ...
      *
-     * @param array $definition foreign key definition
-     *
+     * @param  array  $definition foreign key definition
      * @return string
      */
     public function getAdvancedForeignKeyOptions(array $definition)
@@ -344,9 +336,8 @@ public function createTableSql($name, array $fields, array $options = array())
     /**
      * create a comment on a table.
      *
-     * @param string $table   Name of the table we are commenting
-     * @param string $comment The comment for the table
-     *
+     * @param  string $table   Name of the table we are commenting
+     * @param  string $comment The comment for the table
      * @return string
      */
     public function _createTableCommentSql($table, $comment)
@@ -357,10 +348,9 @@ public function _createTableCommentSql($table, $comment)
     /**
      * create a comment on a column.
      *
-     * @param string $table   Name of the table
-     * @param string $column  Name of the column we are commenting
-     * @param string $comment The comment for the table
-     *
+     * @param  string $table   Name of the table
+     * @param  string $column  Name of the column we are commenting
+     * @param  string $comment The comment for the table
      * @return string
      */
     public function _createColumnCommentSql($table, $column, $comment)
@@ -468,15 +458,14 @@ public function alterTable($name, array $changes, $check = false)
     /**
      * create sequence.
      *
-     * @param string $seqName name of the sequence to be created
-     * @param string $start   start value of the sequence; default is 1
-     * @param array  $options An associative array of table options:
-     *                        array(
-     *                        'comment' => 'Foo',
-     *                        'charset' => 'utf8',
-     *                        'collate' => 'utf8_unicode_ci',
-     *                        );
-     *
+     * @param  string $seqName name of the sequence to be created
+     * @param  string $start   start value of the sequence; default is 1
+     * @param  array  $options An associative array of table options:
+     *                         array(
+     *                         'comment' => 'Foo',
+     *                         'charset' => 'utf8',
+     *                         'collate' => 'utf8_unicode_ci',
+     *                         );
      * @return string
      */
     public function createSequenceSql($seqName, $start = 1, array $options = array())
@@ -491,8 +480,7 @@ public function createSequenceSql($seqName, $start = 1, array $options = array()
     /**
      * drop existing sequence.
      *
-     * @param string $seqName name of the sequence to be dropped
-     *
+     * @param  string $seqName name of the sequence to be dropped
      * @return string
      */
     public function dropSequenceSql($seqName)
@@ -506,9 +494,8 @@ public function dropSequenceSql($seqName)
      * return Oracle's SQL code portion needed to set an index
      * declaration to be unsed in statements like CREATE TABLE.
      *
-     * @param string $name       name of the index
-     * @param array  $definition index definition
-     *
+     * @param  string $name       name of the index
+     * @param  array  $definition index definition
      * @return string Oracle's SQL code portion needed to set an index
      */
     public function getIndexDeclaration($name, array $definition)
diff --git a/lib/Doctrine/Export/Pgsql.php b/lib/Doctrine/Export/Pgsql.php
index 6afbba5a5..69c74c315 100644
--- a/lib/Doctrine/Export/Pgsql.php
+++ b/lib/Doctrine/Export/Pgsql.php
@@ -24,12 +24,8 @@
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  * @author      Lukas Smith <smith@pooteeweet.org> (PEAR MDB2 library)
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7680 $
  */
 class Doctrine_Export_Pgsql extends Doctrine_Export
 {
@@ -48,8 +44,7 @@ public function createDatabaseSql($name)
     /**
      * drop an existing database.
      *
-     * @param string $name name of the database that should be dropped
-     *
+     * @param  string       $name name of the database that should be dropped
      * @throws PDOException
      */
     public function dropDatabaseSql($name)
@@ -62,8 +57,7 @@ public function dropDatabaseSql($name)
      * Return the FOREIGN KEY query section dealing with non-standard options
      * as MATCH, INITIALLY DEFERRED, ON UPDATE, ...
      *
-     * @param array $definition foreign key definition
-     *
+     * @param  array  $definition foreign key definition
      * @return string
      */
     public function getAdvancedForeignKeyOptions(array $definition)
@@ -199,12 +193,10 @@ public function alterTableSql($name, array $changes, $check = false)
      *                                 should be set to another associative array with the properties
      *                                 of the fields to be added. The properties of the fields should
      *                                 be the same as defined by the Metabase parser.
-     * @param bool $check indicates whether the function should just check if the DBMS driver
-     *                    can perform the requested table alterations if the value is true or
-     *                    actually perform them otherwise
-     *
+     * @param  bool                          $check indicates whether the function should just check if the DBMS driver
+     *                                              can perform the requested table alterations if the value is true or
+     *                                              actually perform them otherwise
      * @return bool
-     *
      * @throws Doctrine_Connection_Exception
      */
     public function alterTable($name, array $changes, $check = false)
@@ -220,16 +212,14 @@ public function alterTable($name, array $changes, $check = false)
     /**
      * return RDBMS specific create sequence statement.
      *
-     * @param string $start   start value of the sequence; default is 1
-     * @param array  $options An associative array of table options:
-     *                        array(
-     *                        'comment' => 'Foo',
-     *                        'charset' => 'utf8',
-     *                        'collate' => 'utf8_unicode_ci',
-     *                        );
-     *
+     * @param  string                        $start   start value of the sequence; default is 1
+     * @param  array                         $options An associative array of table options:
+     *                                                array(
+     *                                                'comment' => 'Foo',
+     *                                                'charset' => 'utf8',
+     *                                                'collate' => 'utf8_unicode_ci',
+     *                                                );
      * @return string
-     *
      * @throws Doctrine_Connection_Exception if something fails at database level
      */
     public function createSequenceSql($sequenceName, $start = 1, array $options = array())
@@ -255,8 +245,7 @@ public function dropSequenceSql($sequenceName)
     /**
      * Creates a table.
      *
-     * @param unknown_type $name
-     *
+     * @param  unknown_type $name
      * @return unknown
      */
     public function createTableSql($name, array $fields, array $options = array())
diff --git a/lib/Doctrine/Export/Reporter.php b/lib/Doctrine/Export/Reporter.php
index fc0b6c037..1950919fe 100644
--- a/lib/Doctrine/Export/Reporter.php
+++ b/lib/Doctrine/Export/Reporter.php
@@ -23,12 +23,8 @@
  * Doctrine_Export_Reporter.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7490 $
  */
 class Doctrine_Export_Reporter implements IteratorAggregate
 {
diff --git a/lib/Doctrine/Export/Schema.php b/lib/Doctrine/Export/Schema.php
index 17436b3fd..41252433e 100644
--- a/lib/Doctrine/Export/Schema.php
+++ b/lib/Doctrine/Export/Schema.php
@@ -26,10 +26,6 @@
  *
  * @see        www.doctrine-project.org
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
- * @version     $Revision: 1838 $
- *
  * @author      Nicolas Bérard-Nault <nicobn@gmail.com>
  * @author      Jonathan H. Wage <jwage@mac.com>
  */
diff --git a/lib/Doctrine/Export/Sqlite.php b/lib/Doctrine/Export/Sqlite.php
index acaf5b3a7..9ace9891a 100644
--- a/lib/Doctrine/Export/Sqlite.php
+++ b/lib/Doctrine/Export/Sqlite.php
@@ -24,12 +24,8 @@
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  * @author      Lukas Smith <smith@pooteeweet.org> (PEAR MDB2 library)
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7490 $
  */
 class Doctrine_Export_Sqlite extends Doctrine_Export
 {
@@ -38,8 +34,7 @@ class Doctrine_Export_Sqlite extends Doctrine_Export
      *
      * drop an existing database
      *
-     * @param string $databaseFile Path of the database that should be dropped
-     *
+     * @param  string                    $databaseFile Path of the database that should be dropped
      * @throws Doctrine_Export_Exception if the database file does not exist
      * @throws Doctrine_Export_Exception if something failed during the removal of the database file
      */
@@ -96,7 +91,6 @@ public function createDatabase($databaseFile)
      *                                            'last_login' => array()
      *                                        )
      *                                    )
-     *
      * @throws PDOException
      */
     public function createIndexSql($table, $name, array $definition)
@@ -237,8 +231,7 @@ public function createTableSql($name, array $fields, array $options = array())
      * Return the FOREIGN KEY query section dealing with non-standard options
      * as MATCH, INITIALLY DEFERRED, ON UPDATE, ...
      *
-     * @param array $definition foreign key definition
-     *
+     * @param  array  $definition foreign key definition
      * @return string
      */
     public function getAdvancedForeignKeyOptions(array $definition)
@@ -270,15 +263,14 @@ public function getAdvancedForeignKeyOptions(array $definition)
     /**
      * create sequence.
      *
-     * @param string $seqName name of the sequence to be created
-     * @param string $start   start value of the sequence; default is 1
-     * @param array  $options An associative array of table options:
-     *                        array(
-     *                        'comment' => 'Foo',
-     *                        'charset' => 'utf8',
-     *                        'collate' => 'utf8_unicode_ci',
-     *                        );
-     *
+     * @param  string $seqName name of the sequence to be created
+     * @param  string $start   start value of the sequence; default is 1
+     * @param  array  $options An associative array of table options:
+     *                         array(
+     *                         'comment' => 'Foo',
+     *                         'charset' => 'utf8',
+     *                         'collate' => 'utf8_unicode_ci',
+     *                         );
      * @return bool
      */
     public function createSequence($seqName, $start = 1, array $options = array())
@@ -312,8 +304,7 @@ public function createSequence($seqName, $start = 1, array $options = array())
     /**
      * drop existing sequence.
      *
-     * @param string $sequenceName name of the sequence to be dropped
-     *
+     * @param  string $sequenceName name of the sequence to be dropped
      * @return string
      */
     public function dropSequenceSql($sequenceName)
@@ -410,9 +401,8 @@ public function alterTableSql($name, array $changes, $check = false)
      * Sqlite does not support foreign keys so we are not even going to do anything if this function is called
      * to avoid any sql errors if a user tries to use this on sqlite
      *
-     * @param string $table      name of the table on which the foreign key is to be created
-     * @param array  $definition associative array that defines properties of the foreign key to be created
-     *
+     * @param  string $table      name of the table on which the foreign key is to be created
+     * @param  array  $definition associative array that defines properties of the foreign key to be created
      * @return string
      */
     public function createForeignKey($table, array $definition)
diff --git a/lib/Doctrine/Expression.php b/lib/Doctrine/Expression.php
index 8c54606ce..9c0eee043 100644
--- a/lib/Doctrine/Expression.php
+++ b/lib/Doctrine/Expression.php
@@ -25,12 +25,7 @@
  * This class manages abstractions of dql expressions like query parts
  * that use CONCAT(), MIN(), SUM().
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7490 $
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
@@ -93,8 +88,7 @@ public function setExpression($clause)
      * Parses a single expressions and substitutes dql abstract functions
      * with their concrete sql counterparts for the given connection.
      *
-     * @param string $expr The expression to parse
-     *
+     * @param  string $expr The expression to parse
      * @return string
      */
     public function parseExpression($expr)
@@ -122,8 +116,7 @@ public function parseExpression($expr)
      *
      * @see parseExpression()
      *
-     * @param string $clause The clause. Can be complex and parenthesised.
-     *
+     * @param  string $clause The clause. Can be complex and parenthesised.
      * @return string the parsed clause
      */
     public function parseClause($clause)
diff --git a/lib/Doctrine/Expression/Driver.php b/lib/Doctrine/Expression/Driver.php
index 49d2b440e..fcac1bdd6 100644
--- a/lib/Doctrine/Expression/Driver.php
+++ b/lib/Doctrine/Expression/Driver.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Expression_Driver.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
@@ -57,8 +52,7 @@ public function regexp()
     /**
      * Returns the average value of a column.
      *
-     * @param string $column the column to use
-     *
+     * @param  string $column the column to use
      * @return string generated sql including an AVG aggregate function
      */
     public function avg($column)
@@ -74,9 +68,8 @@ public function avg($column)
      * If a '*' is used instead of a column the number of selected rows
      * is returned.
      *
-     * @param string|int $column the column to use
-     *
-     * @return string generated sql including a COUNT aggregate function
+     * @param  string|int $column the column to use
+     * @return string     generated sql including a COUNT aggregate function
      */
     public function count($column)
     {
@@ -88,8 +81,7 @@ public function count($column)
     /**
      * Returns the highest value of a column.
      *
-     * @param string $column the column to use
-     *
+     * @param  string $column the column to use
      * @return string generated sql including a MAX aggregate function
      */
     public function max($column)
@@ -102,8 +94,7 @@ public function max($column)
     /**
      * Returns the lowest value of a column.
      *
-     * @param string $column the column to use
-     *
+     * @param  string $column the column to use
      * @return string
      */
     public function min($column)
@@ -116,8 +107,7 @@ public function min($column)
     /**
      * Returns the total sum of a column.
      *
-     * @param string $column the column to use
-     *
+     * @param  string $column the column to use
      * @return string
      */
     public function sum($column)
@@ -171,9 +161,8 @@ public function round($column, $decimals = 0)
      * Returns the remainder of the division operation
      * $expression1 / $expression2.
      *
-     * @param string $expression1
-     * @param string $expression2
-     *
+     * @param  string $expression1
+     * @param  string $expression2
      * @return string
      */
     public function mod($expression1, $expression2)
@@ -188,8 +177,7 @@ public function mod($expression1, $expression2)
      * trim
      * returns the string $str with leading and proceeding space characters removed.
      *
-     * @param string $str literal string or column name
-     *
+     * @param  string $str literal string or column name
      * @return string
      */
     public function trim($str)
@@ -201,8 +189,7 @@ public function trim($str)
      * rtrim
      * returns the string $str with proceeding space characters removed.
      *
-     * @param string $str literal string or column name
-     *
+     * @param  string $str literal string or column name
      * @return string
      */
     public function rtrim($str)
@@ -214,8 +201,7 @@ public function rtrim($str)
      * ltrim
      * returns the string $str with leading space characters removed.
      *
-     * @param string $str literal string or column name
-     *
+     * @param  string $str literal string or column name
      * @return string
      */
     public function ltrim($str)
@@ -228,8 +214,7 @@ public function ltrim($str)
      * Returns the string $str with all characters changed to
      * uppercase according to the current character set mapping.
      *
-     * @param string $str literal string or column name
-     *
+     * @param  string $str literal string or column name
      * @return string
      */
     public function upper($str)
@@ -242,8 +227,7 @@ public function upper($str)
      * Returns the string $str with all characters changed to
      * lowercase according to the current character set mapping.
      *
-     * @param string $str literal string or column name
-     *
+     * @param  string $str literal string or column name
      * @return string
      */
     public function lower($str)
@@ -255,9 +239,8 @@ public function lower($str)
      * locate
      * returns the position of the first occurrence of substring $substr in string $str.
      *
-     * @param string $substr literal string to find
-     * @param string $str    literal string
-     *
+     * @param  string $substr literal string to find
+     * @param  string $str    literal string
      * @return int
      */
     public function locate($str, $substr)
@@ -282,8 +265,7 @@ public function now()
      *
      * The string "?000" is returned if the argument is NULL.
      *
-     * @param string $value
-     *
+     * @param  string $value
      * @return string SQL soundex function with given parameter
      */
     public function soundex($value)
@@ -298,10 +280,9 @@ public function soundex($value)
      *
      * SQLite only supports the 2 parameter variant of this function
      *
-     * @param string     $value an sql string literal or column name/alias
-     * @param mixed|null $len
-     *
-     * @return string SQL substring function with given parameters
+     * @param  string     $value an sql string literal or column name/alias
+     * @param  mixed|null $len
+     * @return string     SQL substring function with given parameters
      */
     public function substring($value, $from, $len = null)
     {
@@ -352,7 +333,6 @@ public function not($expression)
      *
      * @param string $type the type of operation, can be '+', '-', '*' or '/'
      * @param string|array(string)
-     *
      * @return string an expression
      */
     private function basicMath($type, array $args)
@@ -376,7 +356,6 @@ private function basicMath($type, array $args)
      * expressions.
      *
      * @param string|array(string)
-     *
      * @return string an expression
      */
     public function add(array $args)
@@ -392,7 +371,6 @@ public function add(array $args)
      * expressions.
      *
      * @param string|array(string)
-     *
      * @return string an expression
      */
     public function sub(array $args)
@@ -408,7 +386,6 @@ public function sub(array $args)
      * expressions.
      *
      * @param string|array(string)
-     *
      * @return string an expression
      */
     public function mul(array $args)
@@ -424,7 +401,6 @@ public function mul(array $args)
      * expressions.
      *
      * @param string|array(string)
-     *
      * @return string an expression
      */
     public function div(array $args)
@@ -435,9 +411,8 @@ public function div(array $args)
     /**
      * Returns the SQL to check if two values are equal.
      *
-     * @param string $value1 logical expression to compare
-     * @param string $value2 logical expression to compare with
-     *
+     * @param  string $value1 logical expression to compare
+     * @param  string $value2 logical expression to compare with
      * @return string logical expression
      */
     public function eq($value1, $value2)
@@ -451,9 +426,8 @@ public function eq($value1, $value2)
     /**
      * Returns the SQL to check if two values are unequal.
      *
-     * @param string $value1 logical expression to compare
-     * @param string $value2 logical expression to compare with
-     *
+     * @param  string $value1 logical expression to compare
+     * @param  string $value2 logical expression to compare with
      * @return string logical expression
      */
     public function neq($value1, $value2)
@@ -467,9 +441,8 @@ public function neq($value1, $value2)
     /**
      * Returns the SQL to check if one value is greater than another value.
      *
-     * @param string $value1 logical expression to compare
-     * @param string $value2 logical expression to compare with
-     *
+     * @param  string $value1 logical expression to compare
+     * @param  string $value2 logical expression to compare with
      * @return string logical expression
      */
     public function gt($value1, $value2)
@@ -484,9 +457,8 @@ public function gt($value1, $value2)
      * Returns the SQL to check if one value is greater than or equal to
      * another value.
      *
-     * @param string $value1 logical expression to compare
-     * @param string $value2 logical expression to compare with
-     *
+     * @param  string $value1 logical expression to compare
+     * @param  string $value2 logical expression to compare with
      * @return string logical expression
      */
     public function gte($value1, $value2)
@@ -500,9 +472,8 @@ public function gte($value1, $value2)
     /**
      * Returns the SQL to check if one value is less than another value.
      *
-     * @param string $value1 logical expression to compare
-     * @param string $value2 logical expression to compare with
-     *
+     * @param  string $value1 logical expression to compare
+     * @param  string $value2 logical expression to compare with
      * @return string logical expression
      */
     public function lt($value1, $value2)
@@ -517,9 +488,8 @@ public function lt($value1, $value2)
      * Returns the SQL to check if one value is less than or equal to
      * another value.
      *
-     * @param string $value1 logical expression to compare
-     * @param string $value2 logical expression to compare with
-     *
+     * @param  string $value1 logical expression to compare
+     * @param  string $value2 logical expression to compare with
      * @return string logical expression
      */
     public function lte($value1, $value2)
@@ -541,7 +511,6 @@ public function lte($value1, $value2)
      *
      * @param string $column the value that should be matched against
      * @param string|array(string)  values that will be matched against $column
-     *
      * @return string logical expression
      */
     public function in($column, $values)
@@ -562,8 +531,7 @@ public function in($column, $values)
     /**
      * Returns SQL that checks if a expression is null.
      *
-     * @param string $expression the expression that should be compared to null
-     *
+     * @param  string $expression the expression that should be compared to null
      * @return string logical expression
      */
     public function isNull($expression)
@@ -576,8 +544,7 @@ public function isNull($expression)
     /**
      * Returns SQL that checks if a expression is not null.
      *
-     * @param string $expression the expression that should be compared to null
-     *
+     * @param  string $expression the expression that should be compared to null
      * @return string logical expression
      */
     public function isNotNull($expression)
@@ -597,10 +564,9 @@ public function isNotNull($expression)
      * http://www.w3schools.com/sql/sql_between.asp. If you want complete database
      * independence you should avoid using between().
      *
-     * @param string $expression the value to compare to
-     * @param string $value1     the lower value to compare with
-     * @param string $value2     the higher value to compare with
-     *
+     * @param  string $expression the value to compare to
+     * @param  string $value1     the lower value to compare with
+     * @param  string $value2     the higher value to compare with
      * @return string logical expression
      */
     public function between($expression, $value1, $value2)
diff --git a/lib/Doctrine/Expression/Exception.php b/lib/Doctrine/Expression/Exception.php
index f5d432931..6f682698d 100644
--- a/lib/Doctrine/Expression/Exception.php
+++ b/lib/Doctrine/Expression/Exception.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Expression_Exception.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7490 $
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
diff --git a/lib/Doctrine/Expression/Mock.php b/lib/Doctrine/Expression/Mock.php
index 9e995aee1..48ebda4e3 100644
--- a/lib/Doctrine/Expression/Mock.php
+++ b/lib/Doctrine/Expression/Mock.php
@@ -23,12 +23,7 @@
  * Doctrine_Expression_Mock
  * Mock driver that is used for testing purposes.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
diff --git a/lib/Doctrine/Expression/Mssql.php b/lib/Doctrine/Expression/Mssql.php
index b46e93e80..2a451bafb 100644
--- a/lib/Doctrine/Expression/Mssql.php
+++ b/lib/Doctrine/Expression/Mssql.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Expression_Mssql.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7490 $
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
@@ -56,9 +51,8 @@ public function now($type = 'timestamp')
     /**
      * return string to call a function to get a substring inside an SQL statement.
      *
-     * @param mixed|null $length
-     *
-     * @return string to call a function to get a substring
+     * @param  mixed|null $length
+     * @return string     to call a function to get a substring
      */
     public function substring($value, $position, $length = null)
     {
@@ -94,8 +88,7 @@ public function guid()
     /**
      * Returns the length of a text field.
      *
-     * @param string $column
-     *
+     * @param  string $column
      * @return string
      */
     public function length($column)
diff --git a/lib/Doctrine/Expression/Mysql.php b/lib/Doctrine/Expression/Mysql.php
index 8ed42e2ff..0bb4b4635 100644
--- a/lib/Doctrine/Expression/Mysql.php
+++ b/lib/Doctrine/Expression/Mysql.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Expression_Mysql.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7490 $
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
@@ -61,11 +56,10 @@ public function random()
      * WARNING: this function is experimental and may change signature at
      * any time until labelled as non-experimental
      *
-     * @param array  $pattern  even keys are strings, odd are patterns (% and _)
-     * @param string $operator optional pattern operator (LIKE, ILIKE and maybe others in the future)
-     * @param string $field    optional field name that is being matched against
-     *                         (might be required when emulating ILIKE)
-     *
+     * @param  array  $pattern  even keys are strings, odd are patterns (% and _)
+     * @param  string $operator optional pattern operator (LIKE, ILIKE and maybe others in the future)
+     * @param  string $field    optional field name that is being matched against
+     *                          (might be required when emulating ILIKE)
      * @return string SQL pattern
      */
     public function matchPattern($pattern, $operator = null, $field = null)
@@ -114,8 +108,7 @@ public function guid()
     /**
      * Returns the year from dbms.
      *
-     * @param string $column
-     *
+     * @param  string $column
      * @return string to get year from dbms
      */
     public function year($column)
@@ -128,8 +121,7 @@ public function year($column)
     /**
      * Returns the month from dbms.
      *
-     * @param string $column
-     *
+     * @param  string $column
      * @return string to get month from dbms
      */
     public function month($column)
@@ -142,8 +134,7 @@ public function month($column)
     /**
      * Returns day from dbms.
      *
-     * @param string $column
-     *
+     * @param  string $column
      * @return string to get day from dbms
      */
     public function day($column)
@@ -156,8 +147,7 @@ public function day($column)
     /**
      * Returns soundex from dbms.
      *
-     * @param string $column
-     *
+     * @param  string $column
      * @return string to get soundex from dbms
      */
     public function soundex($column)
diff --git a/lib/Doctrine/Expression/Oracle.php b/lib/Doctrine/Expression/Oracle.php
index 266181e57..6d7c82e4b 100644
--- a/lib/Doctrine/Expression/Oracle.php
+++ b/lib/Doctrine/Expression/Oracle.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Expression_Sqlite.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7490 $
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
@@ -53,10 +48,9 @@ public function concat()
      *
      * Note: Not SQL92, but common functionality.
      *
-     * @param string $value    an sql string literal or column name/alias
-     * @param int    $position where to start the substring portion
-     * @param int    $length   the substring portion length
-     *
+     * @param  string $value    an sql string literal or column name/alias
+     * @param  int    $position where to start the substring portion
+     * @param  int    $length   the substring portion length
      * @return string SQL substring function with given parameters
      */
     public function substring($value, $position, $length = null)
diff --git a/lib/Doctrine/Expression/Pgsql.php b/lib/Doctrine/Expression/Pgsql.php
index e3c1a68fe..37e529d59 100644
--- a/lib/Doctrine/Expression/Pgsql.php
+++ b/lib/Doctrine/Expression/Pgsql.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Expression_Pgsql.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7685 $
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
@@ -63,10 +58,9 @@ public function md5($column)
      *
      * Note: Not SQL92, but common functionality.
      *
-     * @param string $value the target $value the string or the string column
-     * @param int    $from  extract from this characeter
-     * @param int    $len   extract this amount of characters
-     *
+     * @param  string $value the target $value the string or the string column
+     * @param  int    $from  extract from this characeter
+     * @param  int    $len   extract this amount of characters
      * @return string sql that extracts part of a string
      */
     public function substring($value, $from, $len = null)
@@ -89,17 +83,15 @@ public function substring($value, $from, $len = null)
      * must contain an expression or an array with expressions.
      *
      * @param string|array(string) strings that will be concatinated
-     * @param mixed|null $timestamp2
-     *
+     * @param  mixed|null $timestamp2
      * @return string
      */
 
     /**
      * PostgreSQLs AGE(<timestamp1> [, <timestamp2>]) function.
      *
-     * @param string $timestamp1 timestamp to subtract from NOW()
-     * @param string $timestamp2 optional; if given: subtract arguments
-     *
+     * @param  string $timestamp1 timestamp to subtract from NOW()
+     * @param  string $timestamp2 optional; if given: subtract arguments
      * @return string
      */
     public function age($timestamp1, $timestamp2 = null)
@@ -114,9 +106,8 @@ public function age($timestamp1, $timestamp2 = null)
     /**
      * PostgreSQLs DATE_PART( <text>, <time> ) function.
      *
-     * @param string $text what to extract
-     * @param string $time timestamp or interval to extract from
-     *
+     * @param  string $text what to extract
+     * @param  string $time timestamp or interval to extract from
      * @return string
      */
     public function date_part($text, $time)
@@ -127,9 +118,8 @@ public function date_part($text, $time)
     /**
      * PostgreSQLs TO_CHAR( <time>, <text> ) function.
      *
-     * @param string $time timestamp or interval
-     * @param string $text how to the format the output
-     *
+     * @param  string $time timestamp or interval
+     * @param  string $text how to the format the output
      * @return string
      */
     public function to_char($time, $text)
@@ -141,7 +131,6 @@ public function to_char($time, $text)
      * PostgreSQLs CONCAT() function.
      *
      * @param  an array of values
-     *
      * @return string
      */
     public function concat()
@@ -189,11 +178,10 @@ public function random()
      * WARNING: this function is experimental and may change signature at
      * any time until labelled as non-experimental
      *
-     * @param array  $pattern  even keys are strings, odd are patterns (% and _)
-     * @param string $operator optional pattern operator (LIKE, ILIKE and maybe others in the future)
-     * @param string $field    optional field name that is being matched against
-     *                         (might be required when emulating ILIKE)
-     *
+     * @param  array  $pattern  even keys are strings, odd are patterns (% and _)
+     * @param  string $operator optional pattern operator (LIKE, ILIKE and maybe others in the future)
+     * @param  string $field    optional field name that is being matched against
+     *                          (might be required when emulating ILIKE)
      * @return string SQL pattern
      */
     public function matchPattern($pattern, $operator = null, $field = null)
@@ -242,9 +230,8 @@ public function translate($string, $from, $to)
     /**
      * transform locate to position.
      *
-     * @param string $substr string to find
-     * @param string $str    to find where
-     *
+     * @param  string $substr string to find
+     * @param  string $str    to find where
      * @return string
      */
     public function locate($substr, $str)
@@ -255,9 +242,8 @@ public function locate($substr, $str)
     /**
      * position.
      *
-     * @param string $substr string to find
-     * @param string $str    to find where
-     *
+     * @param  string $substr string to find
+     * @param  string $str    to find where
      * @return string
      */
     public function position($substr, $str)
diff --git a/lib/Doctrine/Expression/Sqlite.php b/lib/Doctrine/Expression/Sqlite.php
index 35de55a36..e3e0f2f2b 100644
--- a/lib/Doctrine/Expression/Sqlite.php
+++ b/lib/Doctrine/Expression/Sqlite.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Expression_Sqlite.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7490 $
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
@@ -46,9 +41,8 @@ public static function md5Impl($data)
     /**
      * Returns the modules of the data that SQLite's mod() function receives.
      *
-     * @param int $dividend
-     * @param int $divisor
-     *
+     * @param  int    $dividend
+     * @param  int    $divisor
      * @return string
      */
     public static function modImpl($dividend, $divisor)
@@ -73,9 +67,8 @@ public static function concatImpl()
      * returns the position of the first occurrence of substring $substr in string $str that
      * SQLite's locate() function receives.
      *
-     * @param string $substr literal string to find
-     * @param string $str    literal string
-     *
+     * @param  string $substr literal string to find
+     * @param  string $str    literal string
      * @return string
      */
     public static function locateImpl($substr, $str)
@@ -125,8 +118,7 @@ public function regexp()
      *
      * The string "?000" is returned if the argument is NULL.
      *
-     * @param string $value
-     *
+     * @param  string $value
      * @return string SQL soundex function with given parameter
      */
     public function soundex($value)
@@ -170,10 +162,9 @@ public function random()
      *
      * SQLite only supports the 2 parameter variant of this function
      *
-     * @param string $value    an sql string literal or column name/alias
-     * @param int    $position where to start the substring portion
-     * @param int    $length   the substring portion length
-     *
+     * @param  string $value    an sql string literal or column name/alias
+     * @param  int    $position where to start the substring portion
+     * @param  int    $length   the substring portion length
      * @return string SQL substring function with given parameters
      */
     public function substring($value, $position, $length = null)
diff --git a/lib/Doctrine/File.php b/lib/Doctrine/File.php
index c9a6346c7..873fe3b1c 100644
--- a/lib/Doctrine/File.php
+++ b/lib/Doctrine/File.php
@@ -23,12 +23,8 @@
  * Doctrine_File.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
- * @version     $Revision$
  *
  * @see        www.doctrine-project.org
- * @since       1.0
  */
 class Doctrine_File extends Doctrine_Record
 {
diff --git a/lib/Doctrine/File/Index.php b/lib/Doctrine/File/Index.php
index 07d49c660..3cd4f09de 100644
--- a/lib/Doctrine/File/Index.php
+++ b/lib/Doctrine/File/Index.php
@@ -23,12 +23,8 @@
  * Doctrine_File_Index.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
- * @version     $Revision$
  *
  * @see        www.doctrine-project.org
- * @since       1.0
  */
 class Doctrine_File_Index extends Doctrine_Record
 {
diff --git a/lib/Doctrine/Formatter.php b/lib/Doctrine/Formatter.php
index 8f85d0dc1..2ffe7e603 100644
--- a/lib/Doctrine/Formatter.php
+++ b/lib/Doctrine/Formatter.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Formatter.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
@@ -42,7 +37,6 @@ class Doctrine_Formatter extends Doctrine_Connection_Module
      * any time until labelled as non-experimental
      *
      * @param   string  the input string to quote
-     *
      * @return string quoted string
      */
     public function escapePattern($text)
@@ -119,9 +113,8 @@ public function convertBooleans($item)
      * InterBase doesn't seem to be able to use delimited identifiers
      * via PHP 4.  They work fine under PHP 5.
      *
-     * @param string $str         identifier name to be quoted
-     * @param bool   $checkOption check the 'quote_identifier' option
-     *
+     * @param  string $str         identifier name to be quoted
+     * @param  bool   $checkOption check the 'quote_identifier' option
      * @return string quoted identifier string
      */
     public function quoteIdentifier($str, $checkOption = true)
@@ -144,9 +137,8 @@ public function quoteIdentifier($str, $checkOption = true)
      * quoteMultipleIdentifier
      * Quotes multiple identifier strings.
      *
-     * @param array $arr         identifiers array to be quoted
-     * @param bool  $checkOption check the 'quote_identifier' option
-     *
+     * @param  array  $arr         identifiers array to be quoted
+     * @param  bool   $checkOption check the 'quote_identifier' option
      * @return string quoted identifier string
      */
     public function quoteMultipleIdentifier($arr, $checkOption = true)
@@ -162,9 +154,8 @@ public function quoteMultipleIdentifier($arr, $checkOption = true)
      * quote
      * quotes given input parameter.
      *
-     * @param mixed  $input parameter to be quoted
-     * @param string $type
-     *
+     * @param  mixed  $input parameter to be quoted
+     * @param  string $type
      * @return string
      */
     public function quote($input, $type = null)
@@ -204,8 +195,7 @@ public function quote($input, $type = null)
     /**
      * Removes any formatting in an sequence name using the 'seqname_format' option.
      *
-     * @param string $sqn string that containts name of a potential sequence
-     *
+     * @param  string $sqn string that containts name of a potential sequence
      * @return string name of the sequence with possible formatting removed
      */
     public function fixSequenceName($sqn)
@@ -223,8 +213,7 @@ public function fixSequenceName($sqn)
     /**
      * Removes any formatting in an index name using the 'idxname_format' option.
      *
-     * @param string $idx string that containts name of anl index
-     *
+     * @param  string $idx string that containts name of anl index
      * @return string name of the index with possible formatting removed
      */
     public function fixIndexName($idx)
@@ -242,7 +231,6 @@ public function fixIndexName($idx)
      * adds sequence name formatting to a sequence name.
      *
      * @param string    name of the sequence
-     *
      * @return string formatted sequence name
      */
     public function getSequenceName($sqn)
@@ -257,7 +245,6 @@ public function getSequenceName($sqn)
      * adds index name formatting to a index name.
      *
      * @param string    name of the index
-     *
      * @return string formatted index name
      */
     public function getIndexName($idx)
@@ -272,7 +259,6 @@ public function getIndexName($idx)
      * Formatting a foreign Key name.
      *
      * @param string    name of the foreign key
-     *
      * @return string formatted foreign key name
      */
     public function getForeignKeyName($fkey)
@@ -287,7 +273,6 @@ public function getForeignKeyName($fkey)
      * adds table name formatting to a table name.
      *
      * @param string    name of the table
-     *
      * @return string formatted table name
      */
     public function getTableName($table)
diff --git a/lib/Doctrine/Hook.php b/lib/Doctrine/Hook.php
index 3203c6bc7..e1ba2c8da 100644
--- a/lib/Doctrine/Hook.php
+++ b/lib/Doctrine/Hook.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Hook.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7490 $
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
@@ -127,10 +122,9 @@ public function setFieldParser($field, $parser)
      * hookWhere
      * builds DQL query where part from given parameter array.
      *
-     * @param array $params an associative array containing field
-     *                      names and their values
-     *
-     * @return bool whether or not the hooking was
+     * @param  array $params an associative array containing field
+     *                       names and their values
+     * @return bool  whether or not the hooking was
      */
     public function hookWhere($params)
     {
@@ -174,10 +168,9 @@ public function hookWhere($params)
      * hookOrderBy
      * builds DQL query orderby part from given parameter array.
      *
-     * @param array $params an array containing all fields which the built query
-     *                      should be ordered by
-     *
-     * @return bool whether or not the hooking was successful
+     * @param  array $params an array containing all fields which the built query
+     *                       should be ordered by
+     * @return bool  whether or not the hooking was successful
      */
     public function hookOrderby($params)
     {
diff --git a/lib/Doctrine/Hook/Equal.php b/lib/Doctrine/Hook/Equal.php
index 14da3f000..6bc7d3c28 100644
--- a/lib/Doctrine/Hook/Equal.php
+++ b/lib/Doctrine/Hook/Equal.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Hook_Equal.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7490 $
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
diff --git a/lib/Doctrine/Hook/Integer.php b/lib/Doctrine/Hook/Integer.php
index 06c58b463..7cf0b2052 100644
--- a/lib/Doctrine/Hook/Integer.php
+++ b/lib/Doctrine/Hook/Integer.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Hook_Integer.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7490 $
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
diff --git a/lib/Doctrine/Hook/Parser.php b/lib/Doctrine/Hook/Parser.php
index f995ed365..890a687e0 100644
--- a/lib/Doctrine/Hook/Parser.php
+++ b/lib/Doctrine/Hook/Parser.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Hook_Parser.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7490 $
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
diff --git a/lib/Doctrine/Hook/Parser/Complex.php b/lib/Doctrine/Hook/Parser/Complex.php
index 774796696..935bfb57b 100644
--- a/lib/Doctrine/Hook/Parser/Complex.php
+++ b/lib/Doctrine/Hook/Parser/Complex.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Hook_Parser_Complex.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7490 $
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
diff --git a/lib/Doctrine/Hook/WordLike.php b/lib/Doctrine/Hook/WordLike.php
index 2894e3470..f8b032590 100644
--- a/lib/Doctrine/Hook/WordLike.php
+++ b/lib/Doctrine/Hook/WordLike.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Hook_WordLike.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7490 $
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
diff --git a/lib/Doctrine/Hydrator.php b/lib/Doctrine/Hydrator.php
index 0595bd0bc..c7c76644a 100644
--- a/lib/Doctrine/Hydrator.php
+++ b/lib/Doctrine/Hydrator.php
@@ -22,12 +22,7 @@
 /**
  * Its purpose is to populate object graphs.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 3192 $
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  * @author      Jonathan H. Wage <jonwage@gmail.com>
@@ -89,8 +84,7 @@ public function getQueryComponents()
     /**
      * Get the name of the driver class for the passed hydration mode.
      *
-     * @param string $mode
-     *
+     * @param  string $mode
      * @return string $className
      */
     public function getHydratorDriverClassName($mode = null)
@@ -109,9 +103,8 @@ public function getHydratorDriverClassName($mode = null)
     /**
      * Get an instance of the hydration driver for the passed hydration mode.
      *
-     * @param string $mode
-     * @param array  $tableAliases
-     *
+     * @param  string                     $mode
+     * @param  array                      $tableAliases
      * @return Doctrine_Hydrator_Abstract
      */
     public function getHydratorDriver($mode, $tableAliases)
@@ -136,10 +129,9 @@ public function getHydratorDriver($mode, $tableAliases)
      * Hydrate the query statement in to its final data structure by one of the
      * hydration drivers.
      *
-     * @param object $stmt
-     * @param array  $tableAliases
-     *
-     * @return mixed $result
+     * @param  object $stmt
+     * @param  array  $tableAliases
+     * @return mixed  $result
      */
     public function hydrateResultSet($stmt, $tableAliases)
     {
diff --git a/lib/Doctrine/Hydrator/Abstract.php b/lib/Doctrine/Hydrator/Abstract.php
index af95fbf1c..e1774f3f5 100644
--- a/lib/Doctrine/Hydrator/Abstract.php
+++ b/lib/Doctrine/Hydrator/Abstract.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Hydrator_Abstract.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 3192 $
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
@@ -94,8 +89,7 @@ public function onDemandReset()
      * certain elements in the result set that do not have any meaning for the result.
      * (I.e. ORACLE limit/offset emulation adds doctrine_rownum to the result set).
      *
-     * @param string $name
-     *
+     * @param  string $name
      * @return bool
      */
     protected function _isIgnoredName($name)
diff --git a/lib/Doctrine/Hydrator/ArrayDriver.php b/lib/Doctrine/Hydrator/ArrayDriver.php
index cd878a9b6..c19e51741 100644
--- a/lib/Doctrine/Hydrator/ArrayDriver.php
+++ b/lib/Doctrine/Hydrator/ArrayDriver.php
@@ -22,12 +22,7 @@
 /**
  * Builds result sets in to the object graph using php arrays.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
diff --git a/lib/Doctrine/Hydrator/ArrayHierarchyDriver.php b/lib/Doctrine/Hydrator/ArrayHierarchyDriver.php
index 128ca7558..2afe33e7f 100644
--- a/lib/Doctrine/Hydrator/ArrayHierarchyDriver.php
+++ b/lib/Doctrine/Hydrator/ArrayHierarchyDriver.php
@@ -22,12 +22,7 @@
 /**
  * Builds result sets in to the hierarchy graph using php arrays.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.2
- *
- * @version     $Revision$
  *
  * @author      Guilherme Blanco <guilhermeblanco@hotmail.com>
  */
diff --git a/lib/Doctrine/Hydrator/ArrayShallowDriver.php b/lib/Doctrine/Hydrator/ArrayShallowDriver.php
index 392b815cc..e6bb2b467 100644
--- a/lib/Doctrine/Hydrator/ArrayShallowDriver.php
+++ b/lib/Doctrine/Hydrator/ArrayShallowDriver.php
@@ -23,12 +23,7 @@
  * Extended version of Doctrine_Hydrator_ScalarDriver, passes its _gatherRowData function a value of false for $aliasPrefix in order to cause it to generate the sorts of array keys one would see in a HYDRATE_ARRAY type return.
  * Note: This hydrator will have issues with fields in the return that have the same name (such as 2 fields each called id) -- the second field value will overwrite the first field.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.2.3
- *
- * @version     $Revision$
  *
  * @author      Will Ferrer
  */
diff --git a/lib/Doctrine/Hydrator/Exception.php b/lib/Doctrine/Hydrator/Exception.php
index 7c5d1f441..9adffe86c 100644
--- a/lib/Doctrine/Hydrator/Exception.php
+++ b/lib/Doctrine/Hydrator/Exception.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Hydrator_Exception.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 1080 $
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
diff --git a/lib/Doctrine/Hydrator/Graph.php b/lib/Doctrine/Hydrator/Graph.php
index e80785d80..10309c1f9 100644
--- a/lib/Doctrine/Hydrator/Graph.php
+++ b/lib/Doctrine/Hydrator/Graph.php
@@ -23,12 +23,7 @@
  * Abstract base class for child drivers to hydrate the object graph in to
  * various data types. For example Doctrine_Record instances or PHP arrays.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  * @author      Roman Borschel <roman@code-factory.org>
diff --git a/lib/Doctrine/Hydrator/NoneDriver.php b/lib/Doctrine/Hydrator/NoneDriver.php
index 924b7706b..871939965 100644
--- a/lib/Doctrine/Hydrator/NoneDriver.php
+++ b/lib/Doctrine/Hydrator/NoneDriver.php
@@ -22,12 +22,7 @@
 /**
  * Get results directly and skip hydration. Uses PDO::FETCH_NUM.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.2
- *
- * @version     $Revision: 3192 $
  *
  * @author      Jonathan H. Wage <jonwage@gmail.com>
  */
diff --git a/lib/Doctrine/Hydrator/RecordDriver.php b/lib/Doctrine/Hydrator/RecordDriver.php
index 5b510c53f..e920a462e 100644
--- a/lib/Doctrine/Hydrator/RecordDriver.php
+++ b/lib/Doctrine/Hydrator/RecordDriver.php
@@ -22,12 +22,7 @@
 /**
  * Builds result sets in to the object graph using Doctrine_Record instances.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  * @author      Roman Borschel <roman@code-factory.org>
diff --git a/lib/Doctrine/Hydrator/RecordHierarchyDriver.php b/lib/Doctrine/Hydrator/RecordHierarchyDriver.php
index 63266ea0d..9b5eb10c5 100644
--- a/lib/Doctrine/Hydrator/RecordHierarchyDriver.php
+++ b/lib/Doctrine/Hydrator/RecordHierarchyDriver.php
@@ -22,12 +22,7 @@
 /**
  * Builds result sets in to the hierarchy graph using php arrays.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.2
- *
- * @version     $Revision$
  *
  * @author      Guilherme Blanco <guilhermeblanco@hotmail.com>
  */
diff --git a/lib/Doctrine/Hydrator/ScalarDriver.php b/lib/Doctrine/Hydrator/ScalarDriver.php
index 8a69fc70a..2450b7d05 100644
--- a/lib/Doctrine/Hydrator/ScalarDriver.php
+++ b/lib/Doctrine/Hydrator/ScalarDriver.php
@@ -22,12 +22,7 @@
 /**
  * Builds result sets in to a scalar php array.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
diff --git a/lib/Doctrine/Hydrator/SingleScalarDriver.php b/lib/Doctrine/Hydrator/SingleScalarDriver.php
index 8b7fcd398..6092010d3 100644
--- a/lib/Doctrine/Hydrator/SingleScalarDriver.php
+++ b/lib/Doctrine/Hydrator/SingleScalarDriver.php
@@ -22,12 +22,7 @@
 /**
  * Returns the first row and first column single scalar value.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
diff --git a/lib/Doctrine/I18n.php b/lib/Doctrine/I18n.php
index ca6d4caba..21d505d60 100644
--- a/lib/Doctrine/I18n.php
+++ b/lib/Doctrine/I18n.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_I18n.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
diff --git a/lib/Doctrine/I18n/Exception.php b/lib/Doctrine/I18n/Exception.php
index 553f17515..4bf6ea804 100644
--- a/lib/Doctrine/I18n/Exception.php
+++ b/lib/Doctrine/I18n/Exception.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_I18n_Exception.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
diff --git a/lib/Doctrine/Import.php b/lib/Doctrine/Import.php
index 8dbe68c20..36be6b4e0 100644
--- a/lib/Doctrine/Import.php
+++ b/lib/Doctrine/Import.php
@@ -27,12 +27,6 @@
  *
  * @see        www.doctrine-project.org
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
- * @since       1.0
- *
- * @version     $Revision: 7490 $
- *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  * @author      Jukka Hassinen <Jukka.Hassinen@BrainAlliance.com>
  */
@@ -71,8 +65,7 @@ public function listFunctions()
     /**
      * lists all database triggers.
      *
-     * @param string|null $database
-     *
+     * @param  string|null $database
      * @return array
      */
     public function listTriggers($database = null)
@@ -83,8 +76,7 @@ public function listTriggers($database = null)
     /**
      * lists all database sequences.
      *
-     * @param string|null $database
-     *
+     * @param  string|null $database
      * @return array
      */
     public function listSequences($database = null)
@@ -99,8 +91,7 @@ public function listSequences($database = null)
     /**
      * lists table constraints.
      *
-     * @param string $table database table name
-     *
+     * @param  string $table database table name
      * @return array
      */
     public function listTableConstraints($table)
@@ -124,8 +115,7 @@ public function listTableConstraints($table)
      *     )
      * )
      *
-     * @param string $table database table name
-     *
+     * @param  string $table database table name
      * @return array
      */
     public function listTableRelations($table)
@@ -136,8 +126,7 @@ public function listTableRelations($table)
     /**
      * lists table constraints.
      *
-     * @param string $table database table name
-     *
+     * @param  string $table database table name
      * @return array
      */
     public function listTableColumns($table)
@@ -148,8 +137,7 @@ public function listTableColumns($table)
     /**
      * lists table constraints.
      *
-     * @param string $table database table name
-     *
+     * @param  string $table database table name
      * @return array
      */
     public function listTableIndexes($table)
@@ -160,8 +148,7 @@ public function listTableIndexes($table)
     /**
      * lists tables.
      *
-     * @param string|null $database
-     *
+     * @param  string|null $database
      * @return array
      */
     public function listTables($database = null)
@@ -172,8 +159,7 @@ public function listTables($database = null)
     /**
      * lists table triggers.
      *
-     * @param string $table database table name
-     *
+     * @param  string $table database table name
      * @return array
      */
     public function listTableTriggers($table)
@@ -184,8 +170,7 @@ public function listTableTriggers($table)
     /**
      * lists table views.
      *
-     * @param string $table database table name
-     *
+     * @param  string $table database table name
      * @return array
      */
     public function listTableViews($table)
@@ -210,8 +195,7 @@ public function listUsers()
     /**
      * lists database views.
      *
-     * @param string|null $database
-     *
+     * @param  string|null $database
      * @return array
      */
     public function listViews($database = null)
@@ -226,8 +210,7 @@ public function listViews($database = null)
     /**
      * checks if a database exists.
      *
-     * @param string $database
-     *
+     * @param  string $database
      * @return bool
      */
     public function databaseExists($database)
@@ -238,8 +221,7 @@ public function databaseExists($database)
     /**
      * checks if a function exists.
      *
-     * @param string $function
-     *
+     * @param  string $function
      * @return bool
      */
     public function functionExists($function)
@@ -250,9 +232,8 @@ public function functionExists($function)
     /**
      * checks if a trigger exists.
      *
-     * @param string      $trigger
-     * @param string|null $database
-     *
+     * @param  string      $trigger
+     * @param  string|null $database
      * @return bool
      */
     public function triggerExists($trigger, $database = null)
@@ -263,9 +244,8 @@ public function triggerExists($trigger, $database = null)
     /**
      * checks if a sequence exists.
      *
-     * @param string      $sequence
-     * @param string|null $database
-     *
+     * @param  string      $sequence
+     * @param  string|null $database
      * @return bool
      */
     public function sequenceExists($sequence, $database = null)
@@ -276,9 +256,8 @@ public function sequenceExists($sequence, $database = null)
     /**
      * checks if a table constraint exists.
      *
-     * @param string $constraint
-     * @param string $table      database table name
-     *
+     * @param  string $constraint
+     * @param  string $table      database table name
      * @return bool
      */
     public function tableConstraintExists($constraint, $table)
@@ -289,9 +268,8 @@ public function tableConstraintExists($constraint, $table)
     /**
      * checks if a table column exists.
      *
-     * @param string $column
-     * @param string $table  database table name
-     *
+     * @param  string $column
+     * @param  string $table  database table name
      * @return bool
      */
     public function tableColumnExists($column, $table)
@@ -302,9 +280,8 @@ public function tableColumnExists($column, $table)
     /**
      * checks if a table index exists.
      *
-     * @param string $index
-     * @param string $table database table name
-     *
+     * @param  string $index
+     * @param  string $table database table name
      * @return bool
      */
     public function tableIndexExists($index, $table)
@@ -315,9 +292,8 @@ public function tableIndexExists($index, $table)
     /**
      * checks if a table exists.
      *
-     * @param string      $table
-     * @param string|null $database
-     *
+     * @param  string      $table
+     * @param  string|null $database
      * @return bool
      */
     public function tableExists($table, $database = null)
@@ -328,9 +304,8 @@ public function tableExists($table, $database = null)
     /**
      * checks if a table trigger exists.
      *
-     * @param string $trigger
-     * @param string $table   database table name
-     *
+     * @param  string $trigger
+     * @param  string $table   database table name
      * @return bool
      */
     public function tableTriggerExists($trigger, $table)
@@ -341,9 +316,8 @@ public function tableTriggerExists($trigger, $table)
     /**
      * checks if a table view exists.
      *
-     * @param string $view
-     * @param string $table database table name
-     *
+     * @param  string $view
+     * @param  string $table database table name
      * @return bool
      */
     public function tableViewExists($view, $table)
@@ -354,8 +328,7 @@ public function tableViewExists($view, $table)
     /**
      * checks if a user exists.
      *
-     * @param string $user
-     *
+     * @param  string $user
      * @return bool
      */
     public function userExists($user)
@@ -366,9 +339,8 @@ public function userExists($user)
     /**
      * checks if a view exists.
      *
-     * @param string      $view
-     * @param string|null $database
-     *
+     * @param  string      $view
+     * @param  string|null $database
      * @return bool
      */
     public function viewExists($view, $database = null)
@@ -381,10 +353,9 @@ public function viewExists($view, $database = null)
      *
      * method for importing existing schema to Doctrine_Record classes
      *
-     * @param string $directory
-     * @param array  $connections Array of connection names to generate models for
-     *
-     * @return array the names of the imported classes
+     * @param  string $directory
+     * @param  array  $connections Array of connection names to generate models for
+     * @return array  the names of the imported classes
      */
     public function importSchema($directory, array $connections = array(), array $options = array())
     {
diff --git a/lib/Doctrine/Import/Builder.php b/lib/Doctrine/Import/Builder.php
index 0d76f97ae..32f7b1049 100644
--- a/lib/Doctrine/Import/Builder.php
+++ b/lib/Doctrine/Import/Builder.php
@@ -27,12 +27,6 @@
  *
  * @see        www.doctrine-project.org
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
- * @since       1.0
- *
- * @version     $Revision: 7490 $
- *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  * @author      Jukka Hassinen <Jukka.Hassinen@BrainAlliance.com>
  * @author      Nicolas Bérard-Nault <nicobn@php.net>
@@ -227,8 +221,7 @@ public function setTargetPath($path)
      *
      * Specify whether or not to generate classes which extend from generated base classes
      *
-     * @param bool $bool
-     *
+     * @param  bool $bool
      * @return bool $bool
      */
     public function generateBaseClasses($bool = null)
@@ -245,8 +238,7 @@ public function generateBaseClasses($bool = null)
      *
      * Specify whether or not to generate children table classes
      *
-     * @param bool $bool
-     *
+     * @param  bool $bool
      * @return bool $bool
      */
     public function generateTableClasses($bool = null)
@@ -498,8 +490,7 @@ public function buildSetUp(array $definition)
     /**
      * Build php code for record checks.
      *
-     * @param array $checks
-     *
+     * @param  array  $checks
      * @return string $build
      */
     public function buildChecks($checks)
@@ -813,10 +804,9 @@ public function buildPhpDocs(array $definition)
     /**
      * emit a behavior assign.
      *
-     * @param int    $level
-     * @param string $name
-     * @param string $option
-     *
+     * @param  int    $level
+     * @param  string $name
+     * @param  string $option
      * @return string assignation code
      */
     private function emitAssign($level, $name, $option)
@@ -833,9 +823,8 @@ private function emitAssign($level, $name, $option)
     /**
      * emit an addChild.
      *
-     * @param int    $level
-     * @param string $name
-     *
+     * @param  int    $level
+     * @param  string $name
      * @return string addChild code
      */
     private function emitAddChild($level, $parent, $name)
@@ -846,9 +835,8 @@ private function emitAddChild($level, $parent, $name)
     /**
      * emit an indented actAs.
      *
-     * @param int    $level
-     * @param string $name
-     *
+     * @param  int    $level
+     * @param  string $name
      * @return string actAs code
      */
     private function emitActAs($level, $name)
@@ -875,11 +863,10 @@ public function buildActAs($actAs)
     /**
      * innerBuildActAs: build a complete actAs code that handles hierarchy of plugins.
      *
-     * @param array  $actAs        array of plugin definitions and options
-     * @param int    $level        current indentation level
-     * @param string $parent       name of the parent template/plugin
-     * @param array  $emittedActAs contains on output an array of actAs command to be appended to output
-     *
+     * @param  array  $actAs        array of plugin definitions and options
+     * @param  int    $level        current indentation level
+     * @param  string $parent       name of the parent template/plugin
+     * @param  array  $emittedActAs contains on output an array of actAs command to be appended to output
      * @return string actAs full definition
      */
     private function innerBuildActAs($actAs, $level = 0, $parent = null, array &$emittedActAs = array())
@@ -951,8 +938,7 @@ private function innerBuildActAs($actAs, $level = 0, $parent = null, array &$emi
     /**
      * Build php code for adding record listeners.
      *
-     * @param string $listeners
-     *
+     * @param  string $listeners
      * @return string $build
      */
     public function buildListeners($listeners)
@@ -1255,9 +1241,8 @@ public function writeTableClassDefinition(array $definition, $path, $options = a
     /**
      * Return the file name of the class to be generated.
      *
-     * @param string $originalClassName
-     * @param array  $definition
-     *
+     * @param  string $originalClassName
+     * @param  array  $definition
      * @return string
      */
     protected function _getFileName($originalClassName, $definition)
diff --git a/lib/Doctrine/Import/Builder/Exception.php b/lib/Doctrine/Import/Builder/Exception.php
index 23bffc5ae..dd1920094 100644
--- a/lib/Doctrine/Import/Builder/Exception.php
+++ b/lib/Doctrine/Import/Builder/Exception.php
@@ -24,12 +24,6 @@
  *
  * @see        www.doctrine-project.org
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
- * @since       1.0
- *
- * @version     $Revision: 7490 $
- *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
 class Doctrine_Import_Builder_Exception extends Doctrine_Import_Exception
diff --git a/lib/Doctrine/Import/Exception.php b/lib/Doctrine/Import/Exception.php
index 13f697844..cc4acaa87 100644
--- a/lib/Doctrine/Import/Exception.php
+++ b/lib/Doctrine/Import/Exception.php
@@ -24,12 +24,6 @@
  *
  * @see        www.doctrine-project.org
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
- * @since       1.0
- *
- * @version     $Revision: 7490 $
- *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
 class Doctrine_Import_Exception extends Doctrine_Exception
diff --git a/lib/Doctrine/Import/Mssql.php b/lib/Doctrine/Import/Mssql.php
index 2b0776aa4..8287b39f3 100644
--- a/lib/Doctrine/Import/Mssql.php
+++ b/lib/Doctrine/Import/Mssql.php
@@ -20,24 +20,19 @@
  */
 
 /**
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  * @author      Lukas Smith <smith@pooteeweet.org> (PEAR MDB2 library)
  * @author      Frank M. Kromann <frank@kromann.info> (PEAR MDB2 Mssql driver)
  * @author      David Coallier <davidc@php.net> (PEAR MDB2 Mssql driver)
  *
- * @version     $Revision: 7675 $
- *
  * @see        www.doctrine-project.org
- * @since       1.0
  */
 class Doctrine_Import_Mssql extends Doctrine_Import
 {
     /**
      * lists all database sequences.
      *
-     * @param string|null $database
-     *
+     * @param  string|null $database
      * @return array
      */
     public function listSequences($database = null)
@@ -84,8 +79,7 @@ public function listTableRelations($tableName)
     /**
      * lists table constraints.
      *
-     * @param string $table database table name
-     *
+     * @param  string $table database table name
      * @return array
      */
     public function listTableColumns($table)
@@ -146,8 +140,7 @@ public function listTableColumns($table)
     /**
      * lists table constraints.
      *
-     * @param string $table database table name
-     *
+     * @param  string $table database table name
      * @return array
      */
     public function listTableIndexes($table)
@@ -157,8 +150,7 @@ public function listTableIndexes($table)
     /**
      * lists tables.
      *
-     * @param string|null $database
-     *
+     * @param  string|null $database
      * @return array
      */
     public function listTables($database = null)
@@ -171,8 +163,7 @@ public function listTables($database = null)
     /**
      * lists all triggers.
      *
-     * @param mixed|null $database
-     *
+     * @param  mixed|null $database
      * @return array
      */
     public function listTriggers($database = null)
@@ -185,8 +176,7 @@ public function listTriggers($database = null)
     /**
      * lists table triggers.
      *
-     * @param string $table database table name
-     *
+     * @param  string $table database table name
      * @return array
      */
     public function listTableTriggers($table)
@@ -200,8 +190,7 @@ public function listTableTriggers($table)
     /**
      * lists table views.
      *
-     * @param string $table database table name
-     *
+     * @param  string $table database table name
      * @return array
      */
     public function listTableViews($table)
@@ -238,8 +227,7 @@ public function listTableViews($table)
     /**
      * lists database views.
      *
-     * @param string|null $database
-     *
+     * @param  string|null $database
      * @return array
      */
     public function listViews($database = null)
diff --git a/lib/Doctrine/Import/Mysql.php b/lib/Doctrine/Import/Mysql.php
index cfe2accde..d5dc9c00d 100644
--- a/lib/Doctrine/Import/Mysql.php
+++ b/lib/Doctrine/Import/Mysql.php
@@ -20,14 +20,10 @@
  */
 
 /**
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  * @author      Lukas Smith <smith@pooteeweet.org> (PEAR MDB2 library)
  *
- * @version     $Revision: 7644 $
- *
  * @see        www.doctrine-project.org
- * @since       1.0
  */
 class Doctrine_Import_Mysql extends Doctrine_Import
 {
@@ -43,8 +39,7 @@ class Doctrine_Import_Mysql extends Doctrine_Import
     /**
      * lists all database sequences.
      *
-     * @param string|null $database
-     *
+     * @param  string|null $database
      * @return array
      */
     public function listSequences($database = null)
@@ -61,8 +56,7 @@ public function listSequences($database = null)
     /**
      * lists table constraints.
      *
-     * @param string $table database table name
-     *
+     * @param  string $table database table name
      * @return array
      */
     public function listTableConstraints($table)
@@ -136,8 +130,7 @@ public function listTableRelations($tableName)
     /**
      * lists table constraints.
      *
-     * @param string $table database table name
-     *
+     * @param  string $table database table name
      * @return array
      */
     public function listTableColumns($table)
@@ -181,8 +174,7 @@ public function listTableColumns($table)
     /**
      * lists table constraints.
      *
-     * @param string $table database table name
-     *
+     * @param  string $table database table name
      * @return array
      */
     public function listTableIndexes($table)
@@ -216,8 +208,7 @@ public function listTableIndexes($table)
     /**
      * lists tables.
      *
-     * @param string|null $database
-     *
+     * @param  string|null $database
      * @return array
      */
     public function listTables($database = null)
@@ -228,8 +219,7 @@ public function listTables($database = null)
     /**
      * lists database views.
      *
-     * @param string|null $database
-     *
+     * @param  string|null $database
      * @return array
      */
     public function listViews($database = null)
diff --git a/lib/Doctrine/Import/Oracle.php b/lib/Doctrine/Import/Oracle.php
index ce1aa2388..b70a13567 100644
--- a/lib/Doctrine/Import/Oracle.php
+++ b/lib/Doctrine/Import/Oracle.php
@@ -20,13 +20,9 @@
  */
 
 /**
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  *
- * @version     $Revision: 7490 $
- *
  * @see        www.doctrine-project.org
- * @since       1.0
  */
 class Doctrine_Import_Oracle extends Doctrine_Import
 {
@@ -63,8 +59,7 @@ public function listFunctions()
     /**
      * lists all database triggers.
      *
-     * @param string|null $database
-     *
+     * @param  string|null $database
      * @return array
      */
     public function listTriggers($database = null)
@@ -77,8 +72,7 @@ public function listTriggers($database = null)
     /**
      * lists all database sequences.
      *
-     * @param string|null $database
-     *
+     * @param  string|null $database
      * @return array
      */
     public function listSequences($database = null)
@@ -93,8 +87,7 @@ public function listSequences($database = null)
     /**
      * lists table constraints.
      *
-     * @param string $table database table name
-     *
+     * @param  string $table database table name
      * @return array
      */
     public function listTableConstraints($table)
@@ -112,8 +105,7 @@ public function listTableConstraints($table)
     /**
      * lists table constraints.
      *
-     * @param string $table database table name
-     *
+     * @param  string $table database table name
      * @return array
      */
     public function listTableColumns($table)
@@ -159,8 +151,7 @@ public function listTableColumns($table)
     /**
      * lists table constraints.
      *
-     * @param string $table database table name
-     *
+     * @param  string $table database table name
      * @return array
      */
     public function listTableIndexes($table)
@@ -204,8 +195,7 @@ public function listTableRelations($table)
     /**
      * lists tables.
      *
-     * @param string|null $database
-     *
+     * @param  string|null $database
      * @return array
      */
     public function listTables($database = null)
@@ -218,8 +208,7 @@ public function listTables($database = null)
     /**
      * lists table triggers.
      *
-     * @param string $table database table name
-     *
+     * @param  string $table database table name
      * @return array
      */
     public function listTableTriggers($table)
@@ -229,8 +218,7 @@ public function listTableTriggers($table)
     /**
      * lists table views.
      *
-     * @param string $table database table name
-     *
+     * @param  string $table database table name
      * @return array
      */
     public function listTableViews($table)
@@ -252,8 +240,7 @@ public function listUsers()
     /**
      * lists database views.
      *
-     * @param string|null $database
-     *
+     * @param  string|null $database
      * @return array
      */
     public function listViews($database = null)
diff --git a/lib/Doctrine/Import/Pgsql.php b/lib/Doctrine/Import/Pgsql.php
index 2eb2a1af3..468bbc6cf 100644
--- a/lib/Doctrine/Import/Pgsql.php
+++ b/lib/Doctrine/Import/Pgsql.php
@@ -20,15 +20,11 @@
  */
 
 /**
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  * @author      Paul Cooper <pgc@ucecom.com>
  * @author      Lukas Smith <smith@pooteeweet.org> (PEAR MDB2 library)
  *
- * @version     $Revision: 7689 $
- *
  * @see        www.doctrine-project.org
- * @since       1.0
  */
 class Doctrine_Import_Pgsql extends Doctrine_Import
 {
@@ -126,8 +122,7 @@ class Doctrine_Import_Pgsql extends Doctrine_Import
     /**
      * lists all database triggers.
      *
-     * @param string|null $database
-     *
+     * @param  string|null $database
      * @return array
      */
     public function listTriggers($database = null)
@@ -137,8 +132,7 @@ public function listTriggers($database = null)
     /**
      * lists table constraints.
      *
-     * @param string $table database table name
-     *
+     * @param  string $table database table name
      * @return array
      */
     public function listTableConstraints($table)
@@ -152,8 +146,7 @@ public function listTableConstraints($table)
     /**
      * lists table constraints.
      *
-     * @param string $table database table name
-     *
+     * @param  string $table database table name
      * @return array
      */
     public function listTableColumns($table)
@@ -230,8 +223,7 @@ public function listTableColumns($table)
     /**
      * list all indexes in a table.
      *
-     * @param string $table database table name
-     *
+     * @param  string $table database table name
      * @return array
      */
     public function listTableIndexes($table)
@@ -245,8 +237,7 @@ public function listTableIndexes($table)
     /**
      * lists tables.
      *
-     * @param string|null $database
-     *
+     * @param  string|null $database
      * @return array
      */
     public function listTables($database = null)
@@ -257,8 +248,7 @@ public function listTables($database = null)
     /**
      * lists table triggers.
      *
-     * @param string $table database table name
-     *
+     * @param  string $table database table name
      * @return array
      */
     public function listTableTriggers($table)
@@ -278,8 +268,7 @@ public function listTableTriggers($table)
     /**
      * list the views in the database that reference a given table.
      *
-     * @param string $table database table name
-     *
+     * @param  string $table database table name
      * @return array
      */
     public function listTableViews($table)
diff --git a/lib/Doctrine/Import/Schema.php b/lib/Doctrine/Import/Schema.php
index 440c02cc9..56ed5fb5e 100644
--- a/lib/Doctrine/Import/Schema.php
+++ b/lib/Doctrine/Import/Schema.php
@@ -26,10 +26,6 @@
  *
  * @see        www.doctrine-project.org
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
- * @version     $Revision: 1838 $
- *
  * @author      Nicolas Bérard-Nault <nicobn@gmail.com>
  * @author      Jonathan H. Wage <jonwage@gmail.com>
  */
@@ -213,10 +209,9 @@ public function setOptions($options)
      *
      * Loop throug directories of schema files and parse them all in to one complete array of schema information
      *
-     * @param string $schema Array of schema files or single schema file. Array of directories with schema files or single directory
-     * @param string $format Format of the files we are parsing and building from
-     *
-     * @return array $array
+     * @param  string $schema Array of schema files or single schema file. Array of directories with schema files or single directory
+     * @param  string $format Format of the files we are parsing and building from
+     * @return array  $array
      */
     public function buildSchema($schema, $format)
     {
@@ -288,10 +283,9 @@ public function importSchema($schema, $format = 'yml', $directory = null, $model
      * A method to parse a Schema and translate it into a property array.
      * The function returns that property array.
      *
-     * @param string $schema Path to the file containing the schema
-     * @param string $type   Format type of the schema we are parsing
-     *
-     * @return array $build    Built array of schema information
+     * @param  string $schema Path to the file containing the schema
+     * @param  string $type   Format type of the schema we are parsing
+     * @return array  $build    Built array of schema information
      */
     public function parseSchema($schema, $type)
     {
@@ -532,8 +526,7 @@ protected function _processInheritance($array)
      * Find the base super class for this inheritance child. We need to move all levels of children to the
      * top most parent.
      *
-     * @param array $array Array of schema information
-     *
+     * @param  array  $array Array of schema information
      * @return string $class  Class to get find the parent for
      */
     protected function _findBaseSuperClass($array, $class)
diff --git a/lib/Doctrine/Import/Sqlite.php b/lib/Doctrine/Import/Sqlite.php
index 6f854d6d3..bdaf0156f 100644
--- a/lib/Doctrine/Import/Sqlite.php
+++ b/lib/Doctrine/Import/Sqlite.php
@@ -20,14 +20,10 @@
  */
 
 /**
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  * @author      Lukas Smith <smith@pooteeweet.org> (PEAR MDB2 library)
  *
- * @version     $Revision: 7644 $
- *
  * @see        www.doctrine-project.org
- * @since       1.0
  */
 class Doctrine_Import_Sqlite extends Doctrine_Import
 {
@@ -52,8 +48,7 @@ public function listFunctions()
     /**
      * lists all database triggers.
      *
-     * @param string|null $database
-     *
+     * @param  string|null $database
      * @return array
      */
     public function listTriggers($database = null)
@@ -63,8 +58,7 @@ public function listTriggers($database = null)
     /**
      * lists all database sequences.
      *
-     * @param string|null $database
-     *
+     * @param  string|null $database
      * @return array
      */
     public function listSequences($database = null)
@@ -88,8 +82,7 @@ public function listSequences($database = null)
     /**
      * lists table constraints.
      *
-     * @param string $table database table name
-     *
+     * @param  string $table database table name
      * @return array
      */
     public function listTableConstraints($table)
@@ -126,8 +119,7 @@ public function listTableConstraints($table)
     /**
      * lists table constraints.
      *
-     * @param string $table database table name
-     *
+     * @param  string $table database table name
      * @return array
      */
     public function listTableColumns($table)
@@ -164,8 +156,7 @@ public function listTableColumns($table)
     /**
      * lists table constraints.
      *
-     * @param string $table database table name
-     *
+     * @param  string $table database table name
      * @return array
      */
     public function listTableIndexes($table)
@@ -178,8 +169,7 @@ public function listTableIndexes($table)
     /**
      * lists tables.
      *
-     * @param string|null $database
-     *
+     * @param  string|null $database
      * @return array
      */
     public function listTables($database = null)
@@ -194,8 +184,7 @@ public function listTables($database = null)
     /**
      * lists table triggers.
      *
-     * @param string $table database table name
-     *
+     * @param  string $table database table name
      * @return array
      */
     public function listTableTriggers($table)
@@ -205,8 +194,7 @@ public function listTableTriggers($table)
     /**
      * lists table views.
      *
-     * @param string $table database table name
-     *
+     * @param  string $table database table name
      * @return array
      */
     public function listTableViews($table)
@@ -238,8 +226,7 @@ public function listUsers()
     /**
      * lists database views.
      *
-     * @param string|null $database
-     *
+     * @param  string|null $database
      * @return array
      */
     public function listViews($database = null)
diff --git a/lib/Doctrine/Inflector.php b/lib/Doctrine/Inflector.php
index 11d9382e4..82789535f 100644
--- a/lib/Doctrine/Inflector.php
+++ b/lib/Doctrine/Inflector.php
@@ -26,12 +26,7 @@
  * across several different php projects and several different authors. The
  * original author names and emails are not known
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 3189 $
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  * @author      Jonathan H. Wage <jonwage@gmail.com>
@@ -41,8 +36,7 @@ class Doctrine_Inflector
     /**
      * Convert word in to the format for a Doctrine table name. Converts 'ModelName' to 'model_name'.
      *
-     * @param string $word Word to tableize
-     *
+     * @param  string $word Word to tableize
      * @return string $word  Tableized word
      */
     public static function tableize($word)
@@ -53,8 +47,7 @@ public static function tableize($word)
     /**
      * Convert a word in to the format for a Doctrine class name. Converts 'table_name' to 'TableName'.
      *
-     * @param string $word Word to classify
-     *
+     * @param  string $word Word to classify
      * @return string $word  Classified word
      */
     public static function classify($word)
@@ -73,8 +66,7 @@ public static function classify($word)
     /**
      * Callback function to classify a classname properly.
      *
-     * @param array $matches An array of matches from a pcre_replace call
-     *
+     * @param  array  $matches An array of matches from a pcre_replace call
      * @return string $string   a string with matches 1 and mathces 3 in upper case
      */
     public static function classifyCallback($matches)
@@ -87,9 +79,8 @@ public static function classifyCallback($matches)
      *
      * By bmorel at ssi dot fr
      *
-     * @param string $string
-     *
-     * @return bool $bool
+     * @param  string $string
+     * @return bool   $bool
      */
     public static function seemsUtf8($string)
     {
@@ -128,8 +119,7 @@ public static function seemsUtf8($string)
     /**
      * Remove any illegal characters, accents, etc.
      *
-     * @param string $string String to unaccent
-     *
+     * @param  string $string String to unaccent
      * @return string $string  Unaccented string
      */
     public static function unaccent($string)
@@ -272,8 +262,7 @@ public static function unaccent($string)
     /**
      * Convert any passed string to a url friendly string. Converts 'My first blog post' to 'my-first-blog-post'.
      *
-     * @param string $text Text to urlize
-     *
+     * @param  string $text Text to urlize
      * @return string $text  Urlized text
      */
     public static function urlize($text)
diff --git a/lib/Doctrine/IntegrityMapper.php b/lib/Doctrine/IntegrityMapper.php
index 75b277032..06a5c8865 100644
--- a/lib/Doctrine/IntegrityMapper.php
+++ b/lib/Doctrine/IntegrityMapper.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_IntegrityMapper.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
diff --git a/lib/Doctrine/Lib.php b/lib/Doctrine/Lib.php
index b979cebf1..6fa7e03ba 100644
--- a/lib/Doctrine/Lib.php
+++ b/lib/Doctrine/Lib.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Lib has not commonly used static functions, mostly for debugging purposes.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7490 $
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
@@ -41,8 +36,7 @@ class Doctrine_Lib
      *
      * @see Doctrine_Record::STATE_* constants
      *
-     * @param int $state the state of record
-     *
+     * @param  int    $state the state of record
      * @return string description of given state
      */
     public static function getRecordStateAsString($state)
@@ -96,8 +90,7 @@ public static function getRecordAsString(Doctrine_Record $record)
      *
      * @see Doctrine_Transaction::STATE_* constants
      *
-     * @param int $state state of the connection as a string
-     *
+     * @param  int    $state state of the connection as a string
      * @return string
      */
     public static function getConnectionStateAsString($state)
@@ -162,8 +155,7 @@ public static function getTableAsString(Doctrine_Table $table)
      *
      * @todo: What about creating a config varialbe for the color?
      *
-     * @param string $sql plain text query
-     *
+     * @param  string $sql plain text query
      * @return string the formatted sql code
      */
     public static function formatSql($sql)
@@ -315,11 +307,10 @@ public static function arrayDiffSimple($array1, $array2)
      * This method creates a given path issuing mkdir commands for all folders
      * that do not exist yet. Equivalent to 'mkdir -p'.
      *
-     * @param string $path
-     * @param int    $mode an integer (octal) chmod parameter for the
-     *                     created directories
-     *
-     * @return bool true if succeeded
+     * @param  string $path
+     * @param  int    $mode an integer (octal) chmod parameter for the
+     *                      created directories
+     * @return bool   true if succeeded
      */
     public static function makeDirectories($path, $mode = 0777)
     {
@@ -340,9 +331,8 @@ public static function makeDirectories($path, $mode = 0777)
      * This method recursively removes a directory and all its descendants.
      * Equivalent to 'rm -rf'.
      *
-     * @param string $folderPath
-     *
-     * @return bool success of the operation
+     * @param  string $folderPath
+     * @return bool   success of the operation
      */
     public static function removeDirectories($folderPath)
     {
diff --git a/lib/Doctrine/Locator.php b/lib/Doctrine/Locator.php
index 79c31784a..5b387691c 100644
--- a/lib/Doctrine/Locator.php
+++ b/lib/Doctrine/Locator.php
@@ -24,17 +24,11 @@
  *
  * @category    Locator
  *
- * @license     http://www.gnu.org/licenses/lgpl.txt LGPL
- *
  * @see        http://www.doctrine-project.org
  *
  * @author      Janne Vanhala <jpvanhal@cc.hut.fi>
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  * @author      Eevert Saukkokoski <dmnEe0@gmail.com>
- *
- * @version     $Revision$
- *
- * @since       1.0
  */
 class Doctrine_Locator implements Countable, IteratorAggregate
 {
@@ -120,9 +114,8 @@ public function contains($name)
      * bind
      * binds a resource to a name.
      *
-     * @param string $name  the name of the resource to bind
-     * @param mixed  $value the value of the resource
-     *
+     * @param  string         $name  the name of the resource to bind
+     * @param  mixed          $value the value of the resource
      * @return Sensei_Locator this object
      */
     public function bind($name, $value)
@@ -136,10 +129,8 @@ public function bind($name, $value)
      * locate
      * locates a resource by given name and returns it.
      *
-     * @param string $name the name of the resource
-     *
-     * @return mixed the located resource
-     *
+     * @param  string                     $name the name of the resource
+     * @return mixed                      the located resource
      * @throws Doctrine_Locator_Exception if the resource could not be found
      */
     public function locate($name)
diff --git a/lib/Doctrine/Locator/Exception.php b/lib/Doctrine/Locator/Exception.php
index b3da90965..79c4052c6 100644
--- a/lib/Doctrine/Locator/Exception.php
+++ b/lib/Doctrine/Locator/Exception.php
@@ -24,16 +24,10 @@
  *
  * @category    Locator
  *
- * @license     http://www.gnu.org/licenses/lgpl.txt LGPL
- *
  * @see        http://www.doctrine-project.org
  *
  * @author      Janne Vanhala <jpvanhal@cc.hut.fi>
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- *
- * @version     $Revision$
- *
- * @since       1.0
  */
 class Doctrine_Locator_Exception extends Doctrine_Exception
 {
diff --git a/lib/Doctrine/Locator/Injectable.php b/lib/Doctrine/Locator/Injectable.php
index 4c5aa0c9d..cd38f94d5 100644
--- a/lib/Doctrine/Locator/Injectable.php
+++ b/lib/Doctrine/Locator/Injectable.php
@@ -24,17 +24,11 @@
  *
  * @category    Locator
  *
- * @license     http://www.gnu.org/licenses/lgpl.txt LGPL
- *
  * @see        http://www.doctrine-project.org
  *
  * @author      Janne Vanhala <jpvanhal@cc.hut.fi>
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  * @author      Eevert Saukkokoski <dmnEe0@gmail.com>
- *
- * @version     $Revision$
- *
- * @since       1.0
  */
 class Doctrine_Locator_Injectable
 {
@@ -58,7 +52,6 @@ class Doctrine_Locator_Injectable
      * this method can be used for setting the locator object locally.
      *
      * @param Doctrine_Locator                the locator object
-     *
      * @return Doctrine_Locator_Injectable this instance
      */
     public function setLocator(Doctrine_Locator $locator)
@@ -95,10 +88,8 @@ public function getLocator()
      *
      * @see Doctrine_Locator::locate()
      *
-     * @param string $name the name of the resource
-     *
-     * @return mixed the located resource
-     *
+     * @param  string                     $name the name of the resource
+     * @return mixed                      the located resource
      * @throws Doctrine_Locator_Exception if the resource could not be found
      */
     public function locate($name)
@@ -120,9 +111,8 @@ public function locate($name)
      * bind
      * binds a resource to a name.
      *
-     * @param string $name  the name of the resource to bind
-     * @param mixed  $value the value of the resource
-     *
+     * @param  string $name  the name of the resource to bind
+     * @param  mixed  $value the value of the resource
      * @return static this object
      */
     public function bind($name, $value)
diff --git a/lib/Doctrine/Locking/Exception.php b/lib/Doctrine/Locking/Exception.php
index d3dc3cf9b..91a5effda 100644
--- a/lib/Doctrine/Locking/Exception.php
+++ b/lib/Doctrine/Locking/Exception.php
@@ -27,12 +27,6 @@
  *
  * @see        www.doctrine-project.org
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
- * @since       1.0
- *
- * @version     $Revision: 7490 $
- *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
 class Doctrine_Locking_Exception extends Doctrine_Exception
diff --git a/lib/Doctrine/Locking/Manager/Pessimistic.php b/lib/Doctrine/Locking/Manager/Pessimistic.php
index 2da813fa2..4d3ff9539 100644
--- a/lib/Doctrine/Locking/Manager/Pessimistic.php
+++ b/lib/Doctrine/Locking/Manager/Pessimistic.php
@@ -29,11 +29,6 @@
  * @author      Roman Borschel <roman@code-factory.org>
  * @author      Pierre Minnieur <pm@pierre-minnieur.de>
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
- * @since       1.0
- *
- * @version     $Revision: 7490 $
  */
 class Doctrine_Locking_Manager_Pessimistic
 {
@@ -92,12 +87,10 @@ public function __construct(Doctrine_Connection $conn)
     /**
      * Obtains a lock on a {@link Doctrine_Record}.
      *
-     * @param Doctrine_Record $record    The record that has to be locked
-     * @param mixed           $userIdent A unique identifier of the locking user
-     *
-     * @return bool TRUE if the locking was successful, FALSE if another user
-     *              holds a lock on this record
-     *
+     * @param  Doctrine_Record            $record    The record that has to be locked
+     * @param  mixed                      $userIdent A unique identifier of the locking user
+     * @return bool                       TRUE if the locking was successful, FALSE if another user
+     *                                    holds a lock on this record
      * @throws Doctrine_Locking_Exception If the locking failed due to database errors
      */
     public function getLock(Doctrine_Record $record, $userIdent)
@@ -164,11 +157,9 @@ public function getLock(Doctrine_Record $record, $userIdent)
     /**
      * Releases a lock on a {@link Doctrine_Record}.
      *
-     * @param Doctrine_Record $record    The record for which the lock has to be released
-     * @param mixed           $userIdent The unique identifier of the locking user
-     *
-     * @return bool TRUE if a lock was released, FALSE if no lock was released
-     *
+     * @param  Doctrine_Record            $record    The record for which the lock has to be released
+     * @param  mixed                      $userIdent The unique identifier of the locking user
+     * @return bool                       TRUE if a lock was released, FALSE if no lock was released
      * @throws Doctrine_Locking_Exception If the release procedure failed due to database errors
      */
     public function releaseLock(Doctrine_Record $record, $userIdent)
@@ -203,11 +194,9 @@ public function releaseLock(Doctrine_Record $record, $userIdent)
     /**
      * Gets the unique user identifier of a lock.
      *
-     * @param string $objectType The type of the object (component name)
-     * @param mixed  $key        The unique key of the object. Can be string or array
-     *
-     * @return string The unique user identifier for the specified lock
-     *
+     * @param  string                     $objectType The type of the object (component name)
+     * @param  mixed                      $key        The unique key of the object. Can be string or array
+     * @return string                     The unique user identifier for the specified lock
      * @throws Doctrine_Locking_Exception If the query failed due to database errors
      */
     private function _getLockingUserIdent($objectType, $key)
@@ -241,9 +230,8 @@ private function _getLockingUserIdent($objectType, $key)
      * Gets the identifier that identifies the owner of the lock on the given
      * record.
      *
-     * @param Doctrine_Record $lockedRecord the record
-     *
-     * @return mixed the unique user identifier that identifies the owner of the lock
+     * @param  Doctrine_Record $lockedRecord the record
+     * @return mixed           the unique user identifier that identifies the owner of the lock
      */
     public function getLockOwner($lockedRecord)
     {
@@ -258,12 +246,10 @@ public function getLockOwner($lockedRecord)
      *
      * When called without parameters all locks older than 15 minutes are released.
      *
-     * @param int    $age        The maximum valid age of locks in seconds
-     * @param string $objectType The type of the object (component name)
-     * @param mixed  $userIdent  The unique identifier of the locking user
-     *
-     * @return int The number of locks that have been released
-     *
+     * @param  int                        $age        The maximum valid age of locks in seconds
+     * @param  string                     $objectType The type of the object (component name)
+     * @param  mixed                      $userIdent  The unique identifier of the locking user
+     * @return int                        The number of locks that have been released
      * @throws Doctrine_Locking_Exception If the release process failed due to database errors
      */
     public function releaseAgedLocks($age = 900, $objectType = null, $userIdent = null)
diff --git a/lib/Doctrine/Manager.php b/lib/Doctrine/Manager.php
index f0603c4fe..d42754e9f 100644
--- a/lib/Doctrine/Manager.php
+++ b/lib/Doctrine/Manager.php
@@ -23,12 +23,7 @@
  * Doctrine_Manager is the base component of all doctrine based projects.
  * It opens and keeps track of all connections (database connections).
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
@@ -257,12 +252,10 @@ public function setQueryRegistry(Doctrine_Query_Registry $registry)
      * if the adapter paramater is not set this method acts as
      * a short cut for Doctrine_Manager::getInstance()->getCurrentConnection()
      *
-     * @param PDO|Doctrine_Adapter_Interface $adapter database driver
-     * @param string                         $name    name of the connection, if empty numeric key is used
-     *
+     * @param  PDO|Doctrine_Adapter_Interface $adapter database driver
+     * @param  string                         $name    name of the connection, if empty numeric key is used
      * @return Doctrine_Connection
-     *
-     * @throws Doctrine_Manager_Exception if trying to bind a connection with an existing name
+     * @throws Doctrine_Manager_Exception     if trying to bind a connection with an existing name
      */
     public static function connection($adapter = null, $name = null)
     {
@@ -276,13 +269,11 @@ public static function connection($adapter = null, $name = null)
     /**
      * Opens a new connection and saves it to Doctrine_Manager->connections.
      *
-     * @param PDO|Doctrine_Adapter_Interface $adapter database driver
-     * @param string                         $name    name of the connection, if empty numeric key is used
-     *
+     * @param  PDO|Doctrine_Adapter_Interface $adapter database driver
+     * @param  string                         $name    name of the connection, if empty numeric key is used
      * @return Doctrine_Connection
-     *
-     * @throws Doctrine_Manager_Exception if trying to bind a connection with an existing name
-     * @throws Doctrine_Manager_Exception if trying to open connection for unknown driver
+     * @throws Doctrine_Manager_Exception     if trying to bind a connection with an existing name
+     * @throws Doctrine_Manager_Exception     if trying to open connection for unknown driver
      */
     public function openConnection($adapter, $name = null, $setCurrent = true)
     {
@@ -358,8 +349,7 @@ public function openConnection($adapter, $name = null, $setCurrent = true)
     /**
      * Parse a pdo style dsn in to an array of parts.
      *
-     * @param array $dsn An array of dsn information
-     *
+     * @param  array $dsn An array of dsn information
      * @return array The array parsed
      *
      * @todo package:dbal
@@ -406,9 +396,8 @@ public function parsePdoDsn($dsn)
      *
      * @see parseDsn()
      *
-     * @param string $dsn
-     *
-     * @return array $parts
+     * @param  string $dsn
+     * @return array  $parts
      */
     protected function _buildDsnPartsArray($dsn)
     {
@@ -442,9 +431,8 @@ protected function _buildDsnPartsArray($dsn)
     /**
      * Parse a Doctrine style dsn string in to an array of parts.
      *
-     * @param string $dsn
-     *
-     * @return array Parsed contents of DSN
+     * @param  string $dsn
+     * @return array  Parsed contents of DSN
      *
      * @todo package:dbal
      */
@@ -521,10 +509,8 @@ public function parseDsn($dsn)
     /**
      * Get the connection instance for the passed name.
      *
-     * @param string $name name of the connection, if empty numeric key is used
-     *
+     * @param  string                     $name name of the connection, if empty numeric key is used
      * @return Doctrine_Connection
-     *
      * @throws Doctrine_Manager_Exception if trying to get a non-existent connection
      */
     public function getConnection($name)
@@ -539,9 +525,8 @@ public function getConnection($name)
     /**
      * Get the name of the passed connection instance.
      *
-     * @param Doctrine_Connection $conn connection object to be searched for
-     *
-     * @return string the name of the connection
+     * @param  Doctrine_Connection $conn connection object to be searched for
+     * @return string              the name of the connection
      */
     public function getConnectionName(Doctrine_Connection $conn)
     {
@@ -553,9 +538,8 @@ public function getConnectionName(Doctrine_Connection $conn)
      * this means that when ever the given component uses a connection
      * it will be using the bound connection instead of the current connection.
      *
-     * @param string $componentName
-     * @param string $connectionName
-     *
+     * @param  string $componentName
+     * @param  string $connectionName
      * @return bool
      */
     public function bindComponent($componentName, $connectionName)
@@ -566,8 +550,7 @@ public function bindComponent($componentName, $connectionName)
     /**
      * Get the connection instance for the specified component.
      *
-     * @param string $componentName
-     *
+     * @param  string              $componentName
      * @return Doctrine_Connection
      */
     public function getConnectionForComponent($componentName)
@@ -584,8 +567,7 @@ public function getConnectionForComponent($componentName)
     /**
      * Check if a component is bound to a connection.
      *
-     * @param string $componentName
-     *
+     * @param  string $componentName
      * @return bool
      */
     public function hasConnectionForComponent($componentName = null)
@@ -627,8 +609,7 @@ public function getConnections()
     /**
      * Sets the current connection to $key.
      *
-     * @param mixed $key the connection key
-     *
+     * @param  mixed                      $key the connection key
      * @throws Doctrine_Manager_Exception
      */
     public function setCurrentConnection($key)
@@ -643,8 +624,7 @@ public function setCurrentConnection($key)
     /**
      * Whether or not the manager contains specified connection.
      *
-     * @param mixed $key the connection key
-     *
+     * @param  mixed $key the connection key
      * @return bool
      */
     public function contains($key)
@@ -678,7 +658,6 @@ public function getIterator()
      * Get the current connection instance.
      *
      * @return Doctrine_Connection
-     *
      * @throws Doctrine_Connection_Exception if there are no open connections
      */
     public function getCurrentConnection()
diff --git a/lib/Doctrine/Manager/Exception.php b/lib/Doctrine/Manager/Exception.php
index 8ad0680f6..f1f637443 100644
--- a/lib/Doctrine/Manager/Exception.php
+++ b/lib/Doctrine/Manager/Exception.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Manager_Exception.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7490 $
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
diff --git a/lib/Doctrine/Migration.php b/lib/Doctrine/Migration.php
index 059953c34..02957f7be 100644
--- a/lib/Doctrine/Migration.php
+++ b/lib/Doctrine/Migration.php
@@ -24,12 +24,7 @@
  *
  * this class represents a database view
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 1080 $
  *
  * @author      Jonathan H. Wage <jwage@mac.com>
  */
@@ -304,11 +299,9 @@ public function getNextMigrationClassVersion()
      * migrate to. It will automatically know whether you are migrating up or down
      * based on the current version of the database.
      *
-     * @param int  $to     Version to migrate to
-     * @param bool $dryRun Whether or not to run the migrate process as a dry run
-     *
-     * @return int $to       Version number migrated to
-     *
+     * @param  int                $to     Version to migrate to
+     * @param  bool               $dryRun Whether or not to run the migrate process as a dry run
+     * @return int                $to       Version number migrated to
      * @throws Doctrine_Exception
      */
     public function migrate($to = null, $dryRun = false)
@@ -360,9 +353,8 @@ public function migrate($to = null, $dryRun = false)
      * Run the migration process but rollback at the very end. Returns true or
      * false for whether or not the migration can be ran.
      *
-     * @param string $to
-     *
-     * @return bool $success
+     * @param  string $to
+     * @return bool   $success
      */
     public function migrateDryRun($to = null)
     {
@@ -418,8 +410,7 @@ public function hasErrors()
     /**
      * Get instance of migration class for number/version specified.
      *
-     * @param int $num
-     *
+     * @param  int                          $num
      * @throws Doctrine_Migration_Exception $e
      */
     public function getMigrationClass($num)
@@ -458,10 +449,8 @@ protected function _throwErrorsException()
     /**
      * Do the actual migration process.
      *
-     * @param int $to
-     *
-     * @return int $to
-     *
+     * @param  int                $to
+     * @return int                $to
      * @throws Doctrine_Exception
      */
     protected function _doMigrate($to)
diff --git a/lib/Doctrine/Migration/Base.php b/lib/Doctrine/Migration/Base.php
index 518fff28a..a83f464d1 100644
--- a/lib/Doctrine/Migration/Base.php
+++ b/lib/Doctrine/Migration/Base.php
@@ -22,12 +22,7 @@
 /**
  * Base migration class. All migration classes must extend from this base class.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.1
- *
- * @version     $Revision: 1080 $
  *
  * @author      Jonathan H. Wage <jonwage@gmail.com>
  */
diff --git a/lib/Doctrine/Migration/Builder.php b/lib/Doctrine/Migration/Builder.php
index 52fa03aaf..06a3a5a3b 100644
--- a/lib/Doctrine/Migration/Builder.php
+++ b/lib/Doctrine/Migration/Builder.php
@@ -24,12 +24,8 @@
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  * @author      Jonathan H. Wage <jwage@mac.com>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 2939 $
  */
 class Doctrine_Migration_Builder extends Doctrine_Builder
 {
@@ -134,9 +130,8 @@ public function down()
     /**
      * Generate migrations from a Doctrine_Migration_Diff instance.
      *
-     * @param Doctrine_Migration_Diff $diff Instance to generate changes from
-     *
-     * @return array $changes  Array of changes produced from the diff
+     * @param  Doctrine_Migration_Diff $diff Instance to generate changes from
+     * @return array                   $changes  Array of changes produced from the diff
      */
     public function generateMigrationsFromDiff(Doctrine_Migration_Diff $diff)
     {
@@ -278,9 +273,8 @@ public function generateMigrationsFromDb()
     /**
      * Generate a set of migrations from a set of models.
      *
-     * @param string $modelsPath   Path to models
-     * @param string $modelLoading What type of model loading to use when loading the models
-     *
+     * @param  string $modelsPath   Path to models
+     * @param  string $modelLoading What type of model loading to use when loading the models
      * @return bool
      */
     public function generateMigrationsFromModels($modelsPath = null, $modelLoading = null)
@@ -338,9 +332,8 @@ public function generateMigrationsFromModels($modelsPath = null, $modelLoading =
     /**
      * Build the code for creating foreign keys.
      *
-     * @param string $tableName
-     * @param array  $definition
-     *
+     * @param  string $tableName
+     * @param  array  $definition
      * @return string $code
      */
     public function buildCreateForeignKey($tableName, $definition)
@@ -351,9 +344,8 @@ public function buildCreateForeignKey($tableName, $definition)
     /**
      * Build the code for dropping foreign keys.
      *
-     * @param string $tableName
-     * @param array  $definition
-     *
+     * @param  string $tableName
+     * @param  array  $definition
      * @return string $code
      */
     public function buildDropForeignKey($tableName, $definition)
@@ -364,8 +356,7 @@ public function buildDropForeignKey($tableName, $definition)
     /**
      * Build the code for creating tables.
      *
-     * @param string $tableData
-     *
+     * @param  string $tableData
      * @return string $code
      */
     public function buildCreateTable($tableData)
@@ -393,8 +384,7 @@ public function buildCreateTable($tableData)
     /**
      * Build the code for dropping tables.
      *
-     * @param string $tableData
-     *
+     * @param  string $tableData
      * @return string $code
      */
     public function buildDropTable($tableData)
@@ -405,10 +395,9 @@ public function buildDropTable($tableData)
     /**
      * Build the code for adding columns.
      *
-     * @param string $tableName
-     * @param string $columnName
-     * @param string $column
-     *
+     * @param  string $tableName
+     * @param  string $columnName
+     * @param  string $column
      * @return string $code
      */
     public function buildAddColumn($tableName, $columnName, $column)
@@ -423,10 +412,9 @@ public function buildAddColumn($tableName, $columnName, $column)
     /**
      * Build the code for removing columns.
      *
-     * @param string $tableName
-     * @param string $columnName
-     * @param string $column
-     *
+     * @param  string $tableName
+     * @param  string $columnName
+     * @param  string $column
      * @return string $code
      */
     public function buildRemoveColumn($tableName, $columnName, $column)
@@ -437,10 +425,9 @@ public function buildRemoveColumn($tableName, $columnName, $column)
     /**
      * Build the code for changing columns.
      *
-     * @param string $tableName
-     * @param string $columnName
-     * @param string $column
-     *
+     * @param  string $tableName
+     * @param  string $columnName
+     * @param  string $column
      * @return string $code
      */
     public function buildChangeColumn($tableName, $columnName, $column)
@@ -455,10 +442,9 @@ public function buildChangeColumn($tableName, $columnName, $column)
     /**
      * Build the code for adding indexes.
      *
-     * @param string $tableName
-     * @param string $indexName
-     * @param string $index
-     *
+     * @param  string  $tableName
+     * @param  string  $indexName
+     * @param  string  $index
      * @return sgtring $code
      */
     public function buildAddIndex($tableName, $indexName, $index)
@@ -469,10 +455,9 @@ public function buildAddIndex($tableName, $indexName, $index)
     /**
      * Build the code for removing indexes.
      *
-     * @param string $tableName
-     * @param string $indexName
-     * @param string $index
-     *
+     * @param  string $tableName
+     * @param  string $indexName
+     * @param  string $index
      * @return string $code
      */
     public function buildRemoveIndex($tableName, $indexName, $index)
@@ -525,12 +510,11 @@ public function generateMigrationClass($className, $options = array(), $up = nul
     /**
      * Build the code for a migration class.
      *
-     * @param string $className Class name to generate
-     * @param string $fileName  File name to write the class to
-     * @param array  $options   Options for the migration class
-     * @param string $up        The code for the up function
-     * @param string $down      The code for the down function
-     *
+     * @param  string $className Class name to generate
+     * @param  string $fileName  File name to write the class to
+     * @param  array  $options   Options for the migration class
+     * @param  string $up        The code for the up function
+     * @param  string $down      The code for the down function
      * @return string $content     The code for the generated class
      */
     public function buildMigrationClass($className, $fileName = null, $options = array(), $up = null, $down = null)
diff --git a/lib/Doctrine/Migration/Diff.php b/lib/Doctrine/Migration/Diff.php
index 8a5708056..3ba9bad4c 100644
--- a/lib/Doctrine/Migration/Diff.php
+++ b/lib/Doctrine/Migration/Diff.php
@@ -23,12 +23,7 @@
  * Doctrine_Migration_Diff - class used for generating differences and migration
  * classes from 'from' and 'to' schema information.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 1080 $
  *
  * @author      Jonathan H. Wage <jonwage@gmail.com>
  */
@@ -137,9 +132,8 @@ public function generateMigrationClasses()
     /**
      * Initialize some Doctrine models at a given path.
      *
-     * @param string $path
-     *
-     * @return array $models
+     * @param  string $path
+     * @return array  $models
      */
     protected function _initializeModels($path)
     {
@@ -160,10 +154,9 @@ protected function _initializeModels($path)
     /**
      * Generate a diff between the from and to schema information.
      *
-     * @param string $from Path to set of models to migrate from
-     * @param string $to   Path to set of models to migrate to
-     *
-     * @return array $changes
+     * @param  string $from Path to set of models to migrate from
+     * @param  string $to   Path to set of models to migrate to
+     * @return array  $changes
      */
     protected function _diff($from, $to)
     {
@@ -186,9 +179,8 @@ protected function _diff($from, $to)
     /**
      * Build array of changes between the from and to array of schema information.
      *
-     * @param array $from Array of schema information to generate changes from
-     * @param array $to   Array of schema information to generate changes for
-     *
+     * @param  array $from Array of schema information to generate changes from
+     * @param  array $to   Array of schema information to generate changes for
      * @return array $changes
      */
     protected function _buildChanges($from, $to)
@@ -291,8 +283,7 @@ protected function _buildChanges($from, $to)
     /**
      * Build all the model schema information for the passed array of models.
      *
-     * @param array $models Array of models to build the schema information for
-     *
+     * @param  array $models Array of models to build the schema information for
      * @return array $info   Array of schema information for all the passed models
      */
     protected function _buildModelInformation(array $models)
@@ -311,8 +302,7 @@ protected function _buildModelInformation(array $models)
     /**
      * Clean the produced model information of any potential prefix text.
      *
-     * @param mixed $info Either array or string to clean of prefixes
-     *
+     * @param  mixed $info Either array or string to clean of prefixes
      * @return mixed $info  Cleaned value which is either an array or string
      */
     protected function _cleanModelInformation($info)
@@ -342,8 +332,7 @@ protected function _cleanModelInformation($info)
      * Get the extension of the type of file contained in a directory.
      * Used to determine if a directory contains YAML or PHP files.
      *
-     * @param string $item
-     *
+     * @param  string $item
      * @return string $extension
      */
     protected function _getItemExtension($item)
@@ -370,11 +359,9 @@ protected function _getItemExtension($item)
     /**
      * Generate a set of models for the schema information source.
      *
-     * @param string $prefix Prefix to generate the models with
-     * @param mixed  $item   The item to generate the models from
-     *
-     * @return string $path    The path where the models were generated
-     *
+     * @param  string                       $prefix Prefix to generate the models with
+     * @param  mixed                        $item   The item to generate the models from
+     * @return string                       $path    The path where the models were generated
      * @throws Doctrine_Migration_Exception $e
      */
     protected function _generateModels($prefix, $item)
diff --git a/lib/Doctrine/Migration/Exception.php b/lib/Doctrine/Migration/Exception.php
index 4449cf02b..e1dfe84a5 100644
--- a/lib/Doctrine/Migration/Exception.php
+++ b/lib/Doctrine/Migration/Exception.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Migration_Exception.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 1080 $
  *
  * @author      Jonathan H. Wage <jwage@mac.com>
  */
diff --git a/lib/Doctrine/Migration/IrreversibleMigrationException.php b/lib/Doctrine/Migration/IrreversibleMigrationException.php
index fd6b3c672..21fb2705d 100644
--- a/lib/Doctrine/Migration/IrreversibleMigrationException.php
+++ b/lib/Doctrine/Migration/IrreversibleMigrationException.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Migration_IrreversibleMigration.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 1080 $
  *
  * @author      Jonathan H. Wage <jwage@mac.com>
  */
diff --git a/lib/Doctrine/Migration/Process.php b/lib/Doctrine/Migration/Process.php
index 0e78bd6aa..e6b355e7d 100644
--- a/lib/Doctrine/Migration/Process.php
+++ b/lib/Doctrine/Migration/Process.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Migration_Process.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 1080 $
  *
  * @author      Jonathan H. Wage <jwage@mac.com>
  */
diff --git a/lib/Doctrine/Node.php b/lib/Doctrine/Node.php
index cacca98f5..62eb24be6 100644
--- a/lib/Doctrine/Node.php
+++ b/lib/Doctrine/Node.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Node.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7490 $
  *
  * @author      Joe Simms <joe.simms@websites4.com>
  */
@@ -104,12 +99,10 @@ public function __construct(Doctrine_Record $record, $options)
      * This is a factory method that returns node instance based upon chosen
      * implementation.
      *
-     * @param object $record   instance of Doctrine_Record
-     * @param string $implName implementation (NestedSet, AdjacencyList, MaterializedPath)
-     * @param array  $options  options
-     *
+     * @param  object                  $record   instance of Doctrine_Record
+     * @param  string                  $implName implementation (NestedSet, AdjacencyList, MaterializedPath)
+     * @param  array                   $options  options
      * @return Doctrine_Node
-     *
      * @throws Doctrine_Node_Exception if $implName is not a valid class
      */
     public static function factory(Doctrine_Record $record, $implName, $options = array())
diff --git a/lib/Doctrine/Node/AdjacencyList.php b/lib/Doctrine/Node/AdjacencyList.php
index d31b0f9d9..7874fc9b7 100644
--- a/lib/Doctrine/Node/AdjacencyList.php
+++ b/lib/Doctrine/Node/AdjacencyList.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Node_AdjacencyList.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7490 $
  *
  * @author      Joe Simms <joe.simms@websites4.com>
  */
diff --git a/lib/Doctrine/Node/AdjacencyList/LevelOrderIterator.php b/lib/Doctrine/Node/AdjacencyList/LevelOrderIterator.php
index f4763c6ba..0d32e64e3 100644
--- a/lib/Doctrine/Node/AdjacencyList/LevelOrderIterator.php
+++ b/lib/Doctrine/Node/AdjacencyList/LevelOrderIterator.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Node_AdjacencyList_LevelOrderIterator.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7490 $
  *
  * @author      Joe Simms <joe.simms@websites4.com>
  */
diff --git a/lib/Doctrine/Node/AdjacencyList/PostOrderIterator.php b/lib/Doctrine/Node/AdjacencyList/PostOrderIterator.php
index 7d65fa28c..02a6a94ae 100644
--- a/lib/Doctrine/Node/AdjacencyList/PostOrderIterator.php
+++ b/lib/Doctrine/Node/AdjacencyList/PostOrderIterator.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Node_AdjacencyList_PostOrderIterator.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7490 $
  *
  * @author      Joe Simms <joe.simms@websites4.com>
  */
diff --git a/lib/Doctrine/Node/AdjacencyList/PreOrderIterator.php b/lib/Doctrine/Node/AdjacencyList/PreOrderIterator.php
index 9eb0dfe03..18a7cc0fa 100644
--- a/lib/Doctrine/Node/AdjacencyList/PreOrderIterator.php
+++ b/lib/Doctrine/Node/AdjacencyList/PreOrderIterator.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Node_AdjacencyList_PreOrderIterator.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7490 $
  *
  * @author      Joe Simms <joe.simms@websites4.com>
  */
diff --git a/lib/Doctrine/Node/Exception.php b/lib/Doctrine/Node/Exception.php
index 0f9b75940..5f0ed874a 100644
--- a/lib/Doctrine/Node/Exception.php
+++ b/lib/Doctrine/Node/Exception.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Node_Exception.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7490 $
  *
  * @author      Joe Simms <joe.simms@websites4.com>
  */
diff --git a/lib/Doctrine/Node/Interface.php b/lib/Doctrine/Node/Interface.php
index c99fccc48..24c2eac27 100644
--- a/lib/Doctrine/Node/Interface.php
+++ b/lib/Doctrine/Node/Interface.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Node_Interface.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7490 $
  *
  * @author      Joe Simms <joe.simms@websites4.com>
  */
@@ -127,9 +122,8 @@ public function getAncestors();
     /**
      * gets path to node from root, uses record::toString() method to get node names.
      *
-     * @param string $seperator   path seperator
-     * @param bool   $includeNode whether or not to include node at end of path
-     *
+     * @param  string $seperator   path seperator
+     * @param  bool   $includeNode whether or not to include node at end of path
      * @return string string representation of path
      */
     public function getPath($seperator = ' > ', $includeNode = false);
diff --git a/lib/Doctrine/Node/MaterializedPath.php b/lib/Doctrine/Node/MaterializedPath.php
index eb9762630..c7a9d11ea 100644
--- a/lib/Doctrine/Node/MaterializedPath.php
+++ b/lib/Doctrine/Node/MaterializedPath.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Node_MaterializedPath.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7490 $
  *
  * @author      Joe Simms <joe.simms@websites4.com>
  */
diff --git a/lib/Doctrine/Node/MaterializedPath/LevelOrderIterator.php b/lib/Doctrine/Node/MaterializedPath/LevelOrderIterator.php
index 4c0116732..56b62c1ef 100644
--- a/lib/Doctrine/Node/MaterializedPath/LevelOrderIterator.php
+++ b/lib/Doctrine/Node/MaterializedPath/LevelOrderIterator.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Node_MaterializedPath_LevelOrderIterator.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7490 $
  *
  * @author      Joe Simms <joe.simms@websites4.com>
  */
diff --git a/lib/Doctrine/Node/MaterializedPath/PostOrderIterator.php b/lib/Doctrine/Node/MaterializedPath/PostOrderIterator.php
index 99606e898..12b39146a 100644
--- a/lib/Doctrine/Node/MaterializedPath/PostOrderIterator.php
+++ b/lib/Doctrine/Node/MaterializedPath/PostOrderIterator.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Node_MaterializedPath_PostOrderIterator.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7490 $
  *
  * @author      Joe Simms <joe.simms@websites4.com>
  */
diff --git a/lib/Doctrine/Node/MaterializedPath/PreOrderIterator.php b/lib/Doctrine/Node/MaterializedPath/PreOrderIterator.php
index 704151855..185a0f344 100644
--- a/lib/Doctrine/Node/MaterializedPath/PreOrderIterator.php
+++ b/lib/Doctrine/Node/MaterializedPath/PreOrderIterator.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Node_MaterializedPath_PreOrderIterator.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7490 $
  *
  * @author      Joe Simms <joe.simms@websites4.com>
  */
diff --git a/lib/Doctrine/Node/NestedSet.php b/lib/Doctrine/Node/NestedSet.php
index 5ac55d662..37fd66321 100644
--- a/lib/Doctrine/Node/NestedSet.php
+++ b/lib/Doctrine/Node/NestedSet.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Node_NestedSet.
  *
- * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see       www.doctrine-project.org
- * @since      1.0
- *
- * @version    $Revision: 7490 $
  *
  * @author     Joe Simms <joe.simms@websites4.com>
  * @author     Roman Borschel <roman@code-factory.org>
@@ -212,9 +207,8 @@ public function getChildren()
     /**
      * gets descendants for node (direct descendants only).
      *
-     * @param mixed|null $depth
-     *
-     * @return mixed the descendants of the node or FALSE if the node has no descendants
+     * @param  mixed|null $depth
+     * @return mixed      the descendants of the node or FALSE if the node has no descendants
      */
     public function getDescendants($depth = null, $includeNode = false)
     {
@@ -274,10 +268,9 @@ public function getParent()
     /**
      * gets ancestors for node.
      *
-     * @param mixed|null $depth
-     *
-     * @return mixed the ancestors of the node or FALSE if the node has no ancestors (this
-     *               basically means it's a root node)
+     * @param  mixed|null $depth
+     * @return mixed      the ancestors of the node or FALSE if the node has no ancestors (this
+     *                    basically means it's a root node)
      */
     public function getAncestors($depth = null)
     {
@@ -301,8 +294,7 @@ public function getAncestors($depth = null)
     /**
      * gets path to node from root, uses record::toString() method to get node names.
      *
-     * @param string $seperator path seperator
-     *
+     * @param  string $seperator path seperator
      * @return string string representation of path
      */
     public function getPath($seperator = ' > ', $includeRecord = false)
@@ -932,8 +924,7 @@ public function isAncestorOf(Doctrine_Record $subj)
     /**
      * determines if node is valid.
      *
-     * @param mixed|null $record
-     *
+     * @param  mixed|null $record
      * @return bool
      */
     public function isValidNode($record = null)
diff --git a/lib/Doctrine/Node/NestedSet/LevelOrderIterator.php b/lib/Doctrine/Node/NestedSet/LevelOrderIterator.php
index 09405ac40..3fcb73b65 100644
--- a/lib/Doctrine/Node/NestedSet/LevelOrderIterator.php
+++ b/lib/Doctrine/Node/NestedSet/LevelOrderIterator.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Node_NestedSet_LevelOrderIterator.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7490 $
  *
  * @author      Joe Simms <joe.simms@websites4.com>
  */
diff --git a/lib/Doctrine/Node/NestedSet/PostOrderIterator.php b/lib/Doctrine/Node/NestedSet/PostOrderIterator.php
index df66a366a..176737b7e 100644
--- a/lib/Doctrine/Node/NestedSet/PostOrderIterator.php
+++ b/lib/Doctrine/Node/NestedSet/PostOrderIterator.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Node_NestedSet_PostOrderIterator.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7490 $
  *
  * @author      Joe Simms <joe.simms@websites4.com>
  */
diff --git a/lib/Doctrine/Node/NestedSet/PreOrderIterator.php b/lib/Doctrine/Node/NestedSet/PreOrderIterator.php
index ba27ac324..8a516e1d6 100644
--- a/lib/Doctrine/Node/NestedSet/PreOrderIterator.php
+++ b/lib/Doctrine/Node/NestedSet/PreOrderIterator.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Node_NestedSet_PreOrderIterator.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7490 $
  *
  * @author      Joe Simms <joe.simms@websites4.com>
  */
diff --git a/lib/Doctrine/Null.php b/lib/Doctrine/Null.php
index 2d3cf3dd8..81c71e9b4 100644
--- a/lib/Doctrine/Null.php
+++ b/lib/Doctrine/Null.php
@@ -25,12 +25,7 @@
  * Simple empty class representing a null value
  * used for extra fast null value testing with isset() rather than array_key_exists()
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7490 $
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
diff --git a/lib/Doctrine/Overloadable.php b/lib/Doctrine/Overloadable.php
index ccc22ed7c..d21db894a 100644
--- a/lib/Doctrine/Overloadable.php
+++ b/lib/Doctrine/Overloadable.php
@@ -23,12 +23,7 @@
  * Doctrine_Overloadable
  * a very generic overloading interface.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7490 $
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
@@ -38,10 +33,9 @@ interface Doctrine_Overloadable
      * __call
      * method overloader.
      *
-     * @param string $m the name of the method
-     * @param array  $a method arguments
-     *
-     * @return mixed return value of the method
+     * @param  string $m the name of the method
+     * @param  array  $a method arguments
+     * @return mixed  return value of the method
      */
     public function __call($m, $a);
 }
diff --git a/lib/Doctrine/Pager.php b/lib/Doctrine/Pager.php
index 83cdf998d..8785705b0 100644
--- a/lib/Doctrine/Pager.php
+++ b/lib/Doctrine/Pager.php
@@ -23,12 +23,8 @@
  * Doctrine_Pager.
  *
  * @author      Guilherme Blanco <guilhermeblanco@hotmail.com>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
- * @version     $Revision$
  *
  * @see        www.doctrine-project.org
- * @since       0.9
  */
 class Doctrine_Pager
 {
@@ -157,10 +153,9 @@ protected function _setExecuted($executed)
      *
      * Builds and return a Doctrine_Pager_Range_* based on arguments
      *
-     * @param string $rangeStyle Pager Range style
-     * @param array  $options    Custom subclass implementation options.
-     *                           Default is a blank array
-     *
+     * @param  string               $rangeStyle Pager Range style
+     * @param  array                $options    Custom subclass implementation options.
+     *                                          Default is a blank array
      * @return Doctrine_Pager_Range Pager Range
      */
     public function getRange($rangeStyle, $options = array())
@@ -514,9 +509,8 @@ public function setCountQueryParams($params = array(), $append = false)
      *
      * Executes the query, populates the collection and then return it
      *
-     * @param $params        Optional parameters to Doctrine_Query::execute
-     * @param $hydrationMode Hydration Mode of Doctrine_Query::execute returned ResultSet
-     *
+     * @param                      $params        Optional parameters to Doctrine_Query::execute
+     * @param                      $hydrationMode Hydration Mode of Doctrine_Query::execute returned ResultSet
      * @return Doctrine_Collection The root collection
      */
     public function execute($params = array(), $hydrationMode = null)
diff --git a/lib/Doctrine/Pager/Exception.php b/lib/Doctrine/Pager/Exception.php
index 5d8e6c231..38899cbfd 100644
--- a/lib/Doctrine/Pager/Exception.php
+++ b/lib/Doctrine/Pager/Exception.php
@@ -23,12 +23,8 @@
  * Doctrine_Pager_Exception.
  *
  * @author      Guilherme Blanco <guilhermeblanco@hotmail.com>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
- * @version     $Revision$
  *
  * @see        www.doctrine-project.org
- * @since       0.9
  */
 class Doctrine_Pager_Exception extends Doctrine_Exception
 {
diff --git a/lib/Doctrine/Pager/Layout.php b/lib/Doctrine/Pager/Layout.php
index 843a736bc..7c683433e 100644
--- a/lib/Doctrine/Pager/Layout.php
+++ b/lib/Doctrine/Pager/Layout.php
@@ -23,12 +23,8 @@
  * Doctrine_Pager_Layout.
  *
  * @author      Guilherme Blanco <guilhermeblanco@hotmail.com>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
- * @version     $Revision$
  *
  * @see        www.doctrine-project.org
- * @since       0.9
  */
 class Doctrine_Pager_Layout
 {
@@ -116,9 +112,8 @@ protected function _setPager($pager)
      *
      * Handy method to execute the query without need to retrieve the Pager instance
      *
-     * @param $params        Optional parameters to Doctrine_Query::execute
-     * @param $hydrationMode Hydration Mode of Doctrine_Query::execute returned ResultSet
-     *
+     * @param                      $params        Optional parameters to Doctrine_Query::execute
+     * @param                      $hydrationMode Hydration Mode of Doctrine_Query::execute returned ResultSet
      * @return Doctrine_Collection The root collection
      */
     public function execute($params = array(), $hydrationMode = null)
@@ -337,7 +332,6 @@ public function display($options = array(), $return = false)
      * Parses the template and returns the string of a processed page
      *
      * @param array    Optional parameters to be applied in template and url mask
-     *
      * @return string Processed template for the given page
      */
     public function processPage($options = array())
@@ -372,7 +366,6 @@ public function __toString()
      * Parse the template of a given page and return the processed template
      *
      * @param array    Optional parameters to be applied in template and url mask
-     *
      * @return string
      */
     protected function _parseTemplate($options = array())
@@ -389,8 +382,7 @@ protected function _parseTemplate($options = array())
      * Parse the url mask to return the correct template depending of the options sent.
      * Already process the mask replacements assigned.
      *
-     * @param $options Optional parameters to be applied in template and url mask
-     *
+     * @param         $options Optional parameters to be applied in template and url mask
      * @return string
      */
     protected function _parseUrlTemplate($options = array())
@@ -415,8 +407,7 @@ protected function _parseUrlTemplate($options = array())
      *
      * Parse the mask replacements of a given page
      *
-     * @param $options Optional parameters to be applied in template and url mask
-     *
+     * @param         $options Optional parameters to be applied in template and url mask
      * @return string
      */
     protected function _parseReplacementsTemplate($options = array())
@@ -438,8 +429,7 @@ protected function _parseReplacementsTemplate($options = array())
      *
      * Parse the url mask of a given page and return the processed url
      *
-     * @param $options Optional parameters to be applied in template and url mask
-     *
+     * @param         $options Optional parameters to be applied in template and url mask
      * @return string
      */
     protected function _parseUrl($options = array())
@@ -460,8 +450,7 @@ protected function _parseUrl($options = array())
      *
      * Parse the mask replacements, changing from to-be replaced mask with new masks/values
      *
-     * @param $str String to have masks replaced
-     *
+     * @param         $str String to have masks replaced
      * @return string
      */
     protected function _parseMaskReplacements($str)
diff --git a/lib/Doctrine/Pager/Range.php b/lib/Doctrine/Pager/Range.php
index 39a4dcf15..3456ee2db 100644
--- a/lib/Doctrine/Pager/Range.php
+++ b/lib/Doctrine/Pager/Range.php
@@ -23,12 +23,8 @@
  * Doctrine_Pager_Range.
  *
  * @author      Guilherme Blanco <guilhermeblanco@hotmail.com>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
- * @version     $Revision$
  *
  * @see        www.doctrine-project.org
- * @since       0.9
  */
 abstract class Doctrine_Pager_Range
 {
@@ -133,8 +129,7 @@ protected function _setOptions($options)
      *
      * Check if a given page is in the range
      *
-     * @param $page Page to be checked
-     *
+     * @param       $page Page to be checked
      * @return bool
      */
     public function isInRange($page)
diff --git a/lib/Doctrine/Pager/Range/Jumping.php b/lib/Doctrine/Pager/Range/Jumping.php
index f2ecc2aa0..a586f958a 100644
--- a/lib/Doctrine/Pager/Range/Jumping.php
+++ b/lib/Doctrine/Pager/Range/Jumping.php
@@ -23,12 +23,8 @@
  * Doctrine_Pager_Range_Jumping.
  *
  * @author      Guilherme Blanco <guilhermeblanco@hotmail.com>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
- * @version     $Revision$
  *
  * @see        www.doctrine-project.org
- * @since       0.9
  */
 class Doctrine_Pager_Range_Jumping extends Doctrine_Pager_Range
 {
diff --git a/lib/Doctrine/Pager/Range/Sliding.php b/lib/Doctrine/Pager/Range/Sliding.php
index 93f911e68..00ca5a87f 100644
--- a/lib/Doctrine/Pager/Range/Sliding.php
+++ b/lib/Doctrine/Pager/Range/Sliding.php
@@ -23,12 +23,8 @@
  * Doctrine_Pager_Range_Sliding.
  *
  * @author      Guilherme Blanco <guilhermeblanco@hotmail.com>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
- * @version     $Revision$
  *
  * @see        www.doctrine-project.org
- * @since       0.9
  */
 class Doctrine_Pager_Range_Sliding extends Doctrine_Pager_Range
 {
diff --git a/lib/Doctrine/Parser.php b/lib/Doctrine/Parser.php
index 7313e8208..5dfdb6707 100644
--- a/lib/Doctrine/Parser.php
+++ b/lib/Doctrine/Parser.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Parser.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 1080 $
  *
  * @author      Jonathan H. Wage <jwage@mac.com>
  */
diff --git a/lib/Doctrine/Parser/Exception.php b/lib/Doctrine/Parser/Exception.php
index c4cb3bf0b..d5a50a0e4 100644
--- a/lib/Doctrine/Parser/Exception.php
+++ b/lib/Doctrine/Parser/Exception.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Parser_Exception.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 1080 $
  *
  * @author      Jonathan H. Wage <jwage@mac.com>
  */
diff --git a/lib/Doctrine/Parser/Json.php b/lib/Doctrine/Parser/Json.php
index 17adf27c6..42f403afb 100644
--- a/lib/Doctrine/Parser/Json.php
+++ b/lib/Doctrine/Parser/Json.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Parser_Json.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 1080 $
  *
  * @author      Jonathan H. Wage <jwage@mac.com>
  */
@@ -38,10 +33,9 @@ class Doctrine_Parser_Json extends Doctrine_Parser
      *
      * Dump an array of data to a specified path or return
      *
-     * @param string $array   Array of data to dump to json
-     * @param string $path    Path to dump json data to
-     * @param string $charset The charset of the data being dumped
-     *
+     * @param  string $array   Array of data to dump to json
+     * @param  string $path    Path to dump json data to
+     * @param  string $charset The charset of the data being dumped
      * @return string $json
      */
     public function dumpData($array, $path = null, $charset = null)
@@ -56,9 +50,8 @@ public function dumpData($array, $path = null, $charset = null)
      *
      * Load and unserialize data from a file or from passed data
      *
-     * @param string $path Path to dump data to
-     *
-     * @return array $json   Array of json objects
+     * @param  string $path Path to dump data to
+     * @return array  $json   Array of json objects
      */
     public function loadData($path, $charset = 'UTF-8')
     {
diff --git a/lib/Doctrine/Parser/Serialize.php b/lib/Doctrine/Parser/Serialize.php
index 8fa2fa2f2..83b0d4fac 100644
--- a/lib/Doctrine/Parser/Serialize.php
+++ b/lib/Doctrine/Parser/Serialize.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Parser_Serialize.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 1080 $
  *
  * @author      Jonathan H. Wage <jwage@mac.com>
  */
diff --git a/lib/Doctrine/Parser/Xml.php b/lib/Doctrine/Parser/Xml.php
index a24ca2f93..f53c24bf5 100644
--- a/lib/Doctrine/Parser/Xml.php
+++ b/lib/Doctrine/Parser/Xml.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Parser_Xml.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 1080 $
  *
  * @author      Jonathan H. Wage <jwage@mac.com>
  */
@@ -38,10 +33,9 @@ class Doctrine_Parser_Xml extends Doctrine_Parser
      *
      * Convert array to xml and dump to specified path or return the xml
      *
-     * @param string $array   Array of data to convert to xml
-     * @param string $path    Path to write xml data to
-     * @param string $charset The charset of the data being dumped
-     *
+     * @param  string $array   Array of data to convert to xml
+     * @param  string $path    Path to write xml data to
+     * @param  string $charset The charset of the data being dumped
      * @return string $xml
      */
     public function dumpData($array, $path = null, $charset = null)
@@ -54,12 +48,11 @@ public function dumpData($array, $path = null, $charset = null)
     /**
      * arrayToXml.
      *
-     * @param string     $array        Array to convert to xml
-     * @param string     $rootNodeName Name of the root node
-     * @param string     $xml          SimpleXmlElement
-     * @param mixed|null $charset
-     *
-     * @return string $asXml        String of xml built from array
+     * @param  string     $array        Array to convert to xml
+     * @param  string     $rootNodeName Name of the root node
+     * @param  string     $xml          SimpleXmlElement
+     * @param  mixed|null $charset
+     * @return string     $asXml        String of xml built from array
      */
     public static function arrayToXml($array, $rootNodeName = 'data', $xml = null, $charset = null)
     {
@@ -101,9 +94,8 @@ public static function arrayToXml($array, $rootNodeName = 'data', $xml = null, $
      *
      * Load xml file and return array of data
      *
-     * @param string $path Path to load xml data from
-     *
-     * @return array $array Array of data converted from xml
+     * @param  string $path Path to load xml data from
+     * @return array  $array Array of data converted from xml
      */
     public function loadData($path, $charset = 'UTF-8')
     {
@@ -119,9 +111,8 @@ public function loadData($path, $charset = 'UTF-8')
      *
      * Prepare simple xml to array for return
      *
-     * @param string $simpleXml
-     *
-     * @return array $return
+     * @param  string $simpleXml
+     * @return array  $return
      */
     public function prepareData($simpleXml)
     {
diff --git a/lib/Doctrine/Parser/Yml.php b/lib/Doctrine/Parser/Yml.php
index c92ff43b8..549e0d77d 100644
--- a/lib/Doctrine/Parser/Yml.php
+++ b/lib/Doctrine/Parser/Yml.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Parser_Yml.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 1080 $
  *
  * @author      Jonathan H. Wage <jwage@mac.com>, Thomas Courbon <harthie@yahoo.fr>
  */
@@ -38,12 +33,10 @@ class Doctrine_Parser_Yml extends Doctrine_Parser
      *
      * Dump an array of data to a specified path or return
      *
-     * @param string     $array   Array of data to dump to yaml
-     * @param string     $path    Path to dump the yaml to
-     * @param mixed|null $charset
-     *
-     * @return string $yaml
-     *
+     * @param  string                    $array   Array of data to dump to yaml
+     * @param  string                    $path    Path to dump the yaml to
+     * @param  mixed|null                $charset
+     * @return string                    $yaml
      * @throws Doctrine_Parser_Exception dumping error
      */
     public function dumpData($array, $path = null, $charset = null)
@@ -65,10 +58,8 @@ public function dumpData($array, $path = null, $charset = null)
      *
      * Load and parse data from a yml file
      *
-     * @param string $path Path to load yaml data from
-     *
-     * @return array $array Array of parsed yaml data
-     *
+     * @param  string                    $path Path to load yaml data from
+     * @return array                     $array Array of parsed yaml data
      * @throws Doctrine_Parser_Exception parsing error
      */
     public function loadData($path, $charset = 'UTF-8')
diff --git a/lib/Doctrine/Parser/sfYaml/sfYaml.php b/lib/Doctrine/Parser/sfYaml/sfYaml.php
index 3d5adfc8a..5c3451d6d 100644
--- a/lib/Doctrine/Parser/sfYaml/sfYaml.php
+++ b/lib/Doctrine/Parser/sfYaml/sfYaml.php
@@ -12,8 +12,6 @@
  * sfYaml offers convenience methods to load and dump YAML.
  *
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- *
- * @version    SVN: $Id: sfYaml.class.php 8988 2008-05-15 20:24:26Z fabien $
  */
 class sfYaml
 {
@@ -55,10 +53,8 @@ public static function getSpecVersion()
      *   print_r($array);
      *  </code>
      *
-     * @param string $input Path of YAML file or string containing YAML
-     *
-     * @return array The YAML converted to a PHP array
-     *
+     * @param  string                   $input Path of YAML file or string containing YAML
+     * @return array                    The YAML converted to a PHP array
      * @throws InvalidArgumentException If the YAML is not valid
      */
     public static function load($input)
@@ -101,9 +97,8 @@ public static function load($input)
      * The dump method, when supplied with an array, will do its best
      * to convert the array into friendly YAML.
      *
-     * @param array $array  PHP array
-     * @param int   $inline The level where you switch to inline YAML
-     *
+     * @param  array  $array  PHP array
+     * @param  int    $inline The level where you switch to inline YAML
      * @return string A YAML string representing the original PHP array
      */
     public static function dump($array, $inline = 2)
diff --git a/lib/Doctrine/Parser/sfYaml/sfYamlDumper.php b/lib/Doctrine/Parser/sfYaml/sfYamlDumper.php
index f44afee4f..e9536586e 100644
--- a/lib/Doctrine/Parser/sfYaml/sfYamlDumper.php
+++ b/lib/Doctrine/Parser/sfYaml/sfYamlDumper.php
@@ -14,18 +14,15 @@
  * sfYamlDumper dumps PHP variables to YAML strings.
  *
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- *
- * @version    SVN: $Id: sfYamlDumper.class.php 10575 2008-08-01 13:08:42Z nicolas $
  */
 class sfYamlDumper
 {
     /**
      * Dumps a PHP value to YAML.
      *
-     * @param mixed $input  The PHP value
-     * @param int   $inline The level where you switch to inline YAML
-     * @param int   $indent The level o indentation indentation (used internally)
-     *
+     * @param  mixed  $input  The PHP value
+     * @param  int    $inline The level where you switch to inline YAML
+     * @param  int    $indent The level o indentation indentation (used internally)
      * @return string The YAML representation of the PHP value
      */
     public function dump($input, $inline = 0, $indent = 0)
diff --git a/lib/Doctrine/Parser/sfYaml/sfYamlInline.php b/lib/Doctrine/Parser/sfYaml/sfYamlInline.php
index 8919f6d62..4509f5cf2 100644
--- a/lib/Doctrine/Parser/sfYaml/sfYamlInline.php
+++ b/lib/Doctrine/Parser/sfYaml/sfYamlInline.php
@@ -14,8 +14,6 @@
  * sfYamlInline implements a YAML parser/dumper for the YAML inline syntax.
  *
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- *
- * @version    SVN: $Id: sfYamlInline.class.php 16177 2009-03-11 08:32:48Z fabien $
  */
 class sfYamlInline
 {
@@ -24,9 +22,8 @@ class sfYamlInline
     /**
      * Convert a YAML string to a PHP array.
      *
-     * @param string $value A YAML string
-     *
-     * @return array A PHP array representing the YAML string
+     * @param  string $value A YAML string
+     * @return array  A PHP array representing the YAML string
      */
     public static function load($value)
     {
@@ -62,8 +59,7 @@ public static function load($value)
     /**
      * Dumps a given PHP variable to a YAML string.
      *
-     * @param mixed $value The PHP variable to convert
-     *
+     * @param  mixed  $value The PHP variable to convert
      * @return string The YAML string representing the PHP array
      */
     public static function dump($value)
@@ -115,8 +111,7 @@ public static function dump($value)
     /**
      * Dumps a PHP array to a YAML string.
      *
-     * @param array $value The PHP array to dump
-     *
+     * @param  array  $value The PHP array to dump
      * @return string The YAML string representing the PHP array
      */
     protected static function dumpArray($value)
@@ -146,11 +141,10 @@ protected static function dumpArray($value)
     /**
      * Parses a scalar to a YAML string.
      *
-     * @param scalar $scalar
-     * @param string $delimiters
-     * @param int    $i
-     * @param bool   $evaluate
-     *
+     * @param  scalar $scalar
+     * @param  string $delimiters
+     * @param  int    $i
+     * @param  bool   $evaluate
      * @return string A YAML string
      */
     public static function parseScalar($scalar, $delimiters = null, $stringDelimiters = array('"', "'"), &$i = 0, $evaluate = true)
@@ -184,9 +178,8 @@ public static function parseScalar($scalar, $delimiters = null, $stringDelimiter
     /**
      * Parses a quoted scalar to YAML.
      *
-     * @param string $scalar
-     * @param int    $i
-     *
+     * @param  string $scalar
+     * @param  int    $i
      * @return string A YAML string
      */
     protected static function parseQuotedScalar($scalar, &$i)
@@ -213,9 +206,8 @@ protected static function parseQuotedScalar($scalar, &$i)
     /**
      * Parses a sequence to a YAML string.
      *
-     * @param string $sequence
-     * @param int    $i
-     *
+     * @param  string $sequence
+     * @param  int    $i
      * @return string A YAML string
      */
     protected static function parseSequence($sequence, &$i = 0)
@@ -267,9 +259,8 @@ protected static function parseSequence($sequence, &$i = 0)
     /**
      * Parses a mapping to a YAML string.
      *
-     * @param string $mapping
-     * @param int    $i
-     *
+     * @param  string $mapping
+     * @param  int    $i
      * @return string A YAML string
      */
     protected static function parseMapping($mapping, &$i = 0)
@@ -329,8 +320,7 @@ protected static function parseMapping($mapping, &$i = 0)
     /**
      * Evaluates scalars and replaces magic values.
      *
-     * @param string $scalar
-     *
+     * @param  string $scalar
      * @return string A YAML string
      */
     protected static function evaluateScalar($scalar)
diff --git a/lib/Doctrine/Parser/sfYaml/sfYamlParser.php b/lib/Doctrine/Parser/sfYaml/sfYamlParser.php
index a05354fba..40f373022 100644
--- a/lib/Doctrine/Parser/sfYaml/sfYamlParser.php
+++ b/lib/Doctrine/Parser/sfYaml/sfYamlParser.php
@@ -18,8 +18,6 @@
  * sfYamlParser parses YAML strings to convert them to PHP arrays.
  *
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- *
- * @version    SVN: $Id: sfYamlParser.class.php 10832 2008-08-13 07:46:08Z fabien $
  */
 class sfYamlParser
 {
@@ -42,10 +40,8 @@ public function __construct($offset = 0)
     /**
      * Parses a YAML string to a PHP value.
      *
-     * @param string $value A YAML string
-     *
-     * @return mixed A PHP value
-     *
+     * @param  string                   $value A YAML string
+     * @return mixed                    A PHP value
      * @throws InvalidArgumentException If the YAML is not valid
      */
     public function parse($value)
@@ -248,8 +244,7 @@ protected function getCurrentLineIndentation()
     /**
      * Returns the next embed block of YAML.
      *
-     * @param int $indentation The indent level at which the block is to be read, or null for default
-     *
+     * @param  int    $indentation The indent level at which the block is to be read, or null for default
      * @return string A YAML string
      */
     protected function getNextEmbedBlock($indentation = null)
@@ -321,9 +316,8 @@ protected function moveToPreviousLine()
     /**
      * Parses a YAML value.
      *
-     * @param string $value A YAML value
-     *
-     * @return mixed A PHP value
+     * @param  string $value A YAML value
+     * @return mixed  A PHP value
      */
     protected function parseValue($value)
     {
@@ -353,10 +347,9 @@ protected function parseValue($value)
     /**
      * Parses a folded scalar.
      *
-     * @param string $separator   The separator that was used to begin this folded scalar (| or >)
-     * @param string $indicator   The indicator that was used to begin this folded scalar (+ or -)
-     * @param int    $indentation The indentation that was used to begin this folded scalar
-     *
+     * @param  string $separator   The separator that was used to begin this folded scalar (| or >)
+     * @param  string $indicator   The indicator that was used to begin this folded scalar (+ or -)
+     * @param  int    $indentation The indentation that was used to begin this folded scalar
      * @return string The text value
      */
     protected function parseFoldedScalar($separator, $indicator = '', $indentation = 0)
@@ -488,8 +481,7 @@ protected function isCurrentLineComment()
     /**
      * Cleanups a YAML string to be parsed.
      *
-     * @param string $value The input YAML string
-     *
+     * @param  string $value The input YAML string
      * @return string A cleaned up YAML string
      */
     protected function cleanup($value)
diff --git a/lib/Doctrine/Query.php b/lib/Doctrine/Query.php
index cf1c13a14..0d80f6663 100644
--- a/lib/Doctrine/Query.php
+++ b/lib/Doctrine/Query.php
@@ -25,12 +25,7 @@
  * data in an object-oriented fashion. A DQL query understands relations and inheritance
  * and is dbms independant.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  *
@@ -176,9 +171,8 @@ class Doctrine_Query extends Doctrine_Query_Abstract implements Countable
      * create
      * returns a new Doctrine_Query object.
      *
-     * @param Doctrine_Connection $conn  optional connection parameter
-     * @param string              $class Query class to instantiate
-     *
+     * @param  Doctrine_Connection $conn  optional connection parameter
+     * @param  string              $class Query class to instantiate
      * @return Doctrine_Query
      */
     public static function create($conn = null, $class = null)
@@ -242,9 +236,8 @@ public function createSubquery()
     /**
      * addPendingJoinCondition.
      *
-     * @param string $componentAlias component alias
-     * @param string $joinCondition  dql join condition
-     *
+     * @param  string         $componentAlias component alias
+     * @param  string         $joinCondition  dql join condition
      * @return Doctrine_Query this object
      */
     public function addPendingJoinCondition($componentAlias, $joinCondition)
@@ -260,8 +253,7 @@ public function addPendingJoinCondition($componentAlias, $joinCondition)
      * fetchArray
      * Convenience method to execute using array fetching as hydration mode.
      *
-     * @param string $params
-     *
+     * @param  string $params
      * @return array
      */
     public function fetchArray($params = array())
@@ -274,9 +266,8 @@ public function fetchArray($params = array())
      * Convenience method to execute the query and return the first item
      * of the collection.
      *
-     * @param array $params        Query parameters
-     * @param int   $hydrationMode Hydration mode: see Doctrine_Core::HYDRATE_* constants
-     *
+     * @param  array                       $params        Query parameters
+     * @param  int                         $hydrationMode Hydration mode: see Doctrine_Core::HYDRATE_* constants
      * @return array|Doctrine_Record|false Array or Doctrine_Collection, depending on hydration mode. False if no result.
      */
     public function fetchOne($params = array(), $hydrationMode = null)
@@ -311,8 +302,7 @@ public function fetchOne($params = array(), $hydrationMode = null)
      * If null is given as the first parameter this method retrieves the current
      * value of Doctrine_Query::$isSubquery.
      *
-     * @param bool $bool whether or not this query acts as a subquery
-     *
+     * @param  bool                $bool whether or not this query acts as a subquery
      * @return Doctrine_Query|bool
      */
     public function isSubquery($bool = null)
@@ -329,8 +319,7 @@ public function isSubquery($bool = null)
     /**
      * getSqlAggregateAlias.
      *
-     * @param string $dqlAlias the dql alias of an aggregate value
-     *
+     * @param  string $dqlAlias the dql alias of an aggregate value
      * @return string
      */
     public function getSqlAggregateAlias($dqlAlias)
@@ -355,8 +344,7 @@ public function getSqlAggregateAlias($dqlAlias)
     /**
      * Check if a dql alias has a sql aggregate alias.
      *
-     * @param string $dqlAlias
-     *
+     * @param  string $dqlAlias
      * @return bool
      */
     public function hasSqlAggregateAlias($dqlAlias)
@@ -398,19 +386,18 @@ public function adjustProcessedParam($index)
      * // array(2) { [0] => string(8) 'name = ?' [1] => string(8) 'date > ?' }
      * </code>
      *
-     * @param string $queryPart the name of the query part; can be:
-     *                          array from, containing strings;
-     *                          array select, containg string;
-     *                          boolean forUpdate;
-     *                          array set;
-     *                          array join;
-     *                          array where;
-     *                          array groupby;
-     *                          array having;
-     *                          array orderby, containing strings such as 'id ASC';
-     *                          array limit, containing numerics;
-     *                          array offset, containing numerics;
-     *
+     * @param  string $queryPart the name of the query part; can be:
+     *                           array from, containing strings;
+     *                           array select, containg string;
+     *                           boolean forUpdate;
+     *                           array set;
+     *                           array join;
+     *                           array where;
+     *                           array groupby;
+     *                           array having;
+     *                           array orderby, containing strings such as 'id ASC';
+     *                           array limit, containing numerics;
+     *                           array offset, containing numerics;
      * @return array
      */
     public function getDqlPart($queryPart)
@@ -427,8 +414,7 @@ public function getDqlPart($queryPart)
      *
      * Method to check if a arbitrary piece of dql exists
      *
-     * @param string $dql Arbitrary piece of dql to check for
-     *
+     * @param  string $dql Arbitrary piece of dql to check for
      * @return bool
      */
     public function contains($dql)
@@ -443,10 +429,8 @@ public function contains($dql)
      * specific component is being parsed. For instance, the wildcard '*'
      * is expanded in the list of columns.
      *
-     * @param string $componentAlias the alias of the component
-     *
-     * @return string SQL code
-     *
+     * @param  string                   $componentAlias the alias of the component
+     * @return string                   SQL code
      * @throws Doctrine_Query_Exception if unknown component alias has been given
      *
      * @todo Description: What is a 'pending field' (and are there non-pending fields, too)?
@@ -526,10 +510,8 @@ public function processPendingFields($componentAlias)
      * $q->parseSelectField('u.Phonenumber.value');
      * </code>.
      *
-     * @param string $field
-     *
-     * @return string SQL fragment
-     *
+     * @param  string                   $field
+     * @return string                   SQL fragment
      * @throws Doctrine_Query_Exception if unknown component alias has been given
      *
      * @todo Description: Explain what this method does. Is there a relation to parseSelect()?
@@ -574,8 +556,7 @@ public function parseSelectField($field)
      * getExpressionOwner
      * returns the component alias for owner of given expression.
      *
-     * @param string $expr expression from which to get to owner from
-     *
+     * @param  string $expr expression from which to get to owner from
      * @return string the component alias
      *
      * @todo Description: What does it mean if a component is an 'owner' of an expression?
@@ -1104,8 +1085,7 @@ protected function _buildSqlFromPart($ignorePending = false)
      * to root component/joined components without interfering in the main dql
      * handling.
      *
-     * @param string $alias Component Alias
-     *
+     * @param  string    $alias Component Alias
      * @return Processed pending conditions
      */
     protected function _processPendingJoinConditions($alias)
@@ -1130,10 +1110,9 @@ protected function _processPendingJoinConditions($alias)
      * builds the sql query from the given parameters and applies things such as
      * column aggregation inheritance and limit subqueries if needed.
      *
-     * @param array $params        an array of prepared statement params (needed only in mysql driver
-     *                             when limit subquery algorithm is used)
-     * @param bool  $limitSubquery Whether or not to try and apply the limit subquery algorithm
-     *
+     * @param  array  $params        an array of prepared statement params (needed only in mysql driver
+     *                               when limit subquery algorithm is used)
+     * @param  bool   $limitSubquery Whether or not to try and apply the limit subquery algorithm
      * @return string the built sql query
      */
     public function getSqlQuery($params = array(), $limitSubquery = true)
@@ -1157,8 +1136,7 @@ public function getSqlQuery($params = array(), $limitSubquery = true)
     /**
      * Build the SQL query from the DQL.
      *
-     * @param bool $limitSubquery Whether or not to try and apply the limit subquery algorithm
-     *
+     * @param  bool   $limitSubquery Whether or not to try and apply the limit subquery algorithm
      * @return string $sql The generated SQL string
      */
     public function buildSqlQuery($limitSubquery = true)
@@ -1631,11 +1609,9 @@ private function _isOrderedByJoinedColumn()
      * first splits the query in parts and then uses individual
      * parsers for each part.
      *
-     * @param string $query DQL query
-     * @param bool   $clear whether or not to clear the aliases
-     *
+     * @param  string                   $query DQL query
+     * @param  bool                     $clear whether or not to clear the aliases
      * @return Doctrine_Query
-     *
      * @throws Doctrine_Query_Exception if some generic parsing error occurs
      */
     public function parseDqlQuery($query, $clear = true)
@@ -1963,9 +1939,8 @@ protected function buildAssociativeRelationSql(Doctrine_Relation $relation, $ass
     /**
      * loadRoot.
      *
-     * @param string $name
-     * @param string $componentAlias
-     *
+     * @param  string         $name
+     * @param  string         $componentAlias
      * @return Doctrine_Table
      *
      * @todo DESCRIBE ME!
@@ -2005,9 +1980,8 @@ public function loadRoot($name, $componentAlias)
     /**
      * @todo DESCRIBE ME!
      *
-     * @param string $name           component class name
-     * @param string $componentAlias alias of the component in the dql
-     *
+     * @param  string $name           component class name
+     * @param  string $componentAlias alias of the component in the dql
      * @return string query part
      */
     public function buildInheritanceJoinSql($name, $componentAlias)
@@ -2147,9 +2121,8 @@ public function getCountSqlQuery()
      *          LEFT JOIN u.Phonenumber p
      *          WHERE p.phonenumber = '123 123'
      *
-     * @param array $params an array of prepared statement parameters
-     *
-     * @return int the count of this query
+     * @param  array $params an array of prepared statement parameters
+     * @return int   the count of this query
      */
     #[ReturnTypeWillChange]
     public function count($params = array())
diff --git a/lib/Doctrine/Query/Abstract.php b/lib/Doctrine/Query/Abstract.php
index 994c9cbcd..3b1cfa0e0 100644
--- a/lib/Doctrine/Query/Abstract.php
+++ b/lib/Doctrine/Query/Abstract.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Query_Abstract.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 1393 $
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  *
@@ -293,9 +288,8 @@ abstract class Doctrine_Query_Abstract
     /**
      * Constructor.
      *
-     * @param Doctrine_Connection        $connection the connection object the query will use
-     * @param Doctrine_Hydrator_Abstract $hydrator   the hydrator that will be used for generating result sets
-     *
+     * @param  Doctrine_Connection           $connection the connection object the query will use
+     * @param  Doctrine_Hydrator_Abstract    $hydrator   the hydrator that will be used for generating result sets
      * @throws Doctrine_Connection_Exception
      */
     public function __construct(
@@ -330,9 +324,8 @@ public function setConnection(Doctrine_Connection $connection)
     /**
      * setOption.
      *
-     * @param string $name  option name
-     * @param string $value option value
-     *
+     * @param  string                   $name  option name
+     * @param  string                   $value option value
      * @throws Doctrine_Query_Exception
      */
     public function setOption($name, $value)
@@ -347,8 +340,7 @@ public function setOption($name, $value)
      * setAutoFree
      * Sets auto free.
      *
-     * @param bool $value True or false (true by default)
-     *
+     * @param  bool  $value True or false (true by default)
      * @return $this
      */
     public function setAutoFree($value = true)
@@ -362,9 +354,8 @@ public function setAutoFree($value = true)
      * hasSqlTableAlias
      * whether or not this object has given tableAlias.
      *
-     * @param string $sqlTableAlias the table alias to be checked
-     *
-     * @return bool true if this object has given alias, otherwise false
+     * @param  string $sqlTableAlias the table alias to be checked
+     * @return bool   true if this object has given alias, otherwise false
      */
     public function hasSqlTableAlias($sqlTableAlias)
     {
@@ -418,8 +409,7 @@ public function getDql()
      * getSqlQueryPart
      * gets an SQL query part from the SQL query part array.
      *
-     * @param string $part the name of the query part to get
-     *
+     * @param  string                   $part the name of the query part to get
      * @throws Doctrine_Query_Exception if trying to get an unknown query part
      */
     public function getSqlQueryPart($part)
@@ -435,11 +425,9 @@ public function getSqlQueryPart($part)
      * setSqlQueryPart
      * sets an SQL query part in the SQL query part array.
      *
-     * @param string $name the name of the query part to be set
-     * @param string $part query part string
-     *
-     * @return $this this object
-     *
+     * @param  string                   $name the name of the query part to be set
+     * @param  string                   $part query part string
+     * @return $this                    this object
      * @throws Doctrine_Query_Exception if trying to set unknown query part
      */
     public function setSqlQueryPart($name, $part)
@@ -465,11 +453,9 @@ public function setSqlQueryPart($name, $part)
      * addSqlQueryPart
      * adds an SQL query part to the SQL query part array.
      *
-     * @param string $name the name of the query part to be added
-     * @param string $part query part string
-     *
-     * @return $this this object
-     *
+     * @param  string                   $name the name of the query part to be added
+     * @param  string                   $part query part string
+     * @return $this                    this object
      * @throws Doctrine_Query_Exception if trying to add unknown query part
      */
     public function addSqlQueryPart($name, $part)
@@ -490,10 +476,8 @@ public function addSqlQueryPart($name, $part)
      * removeSqlQueryPart
      * removes a query part from the query part array.
      *
-     * @param string $name the name of the query part to be removed
-     *
-     * @return $this this object
-     *
+     * @param  string                   $name the name of the query part to be removed
+     * @return $this                    this object
      * @throws Doctrine_Query_Exception if trying to remove unknown query part
      */
     public function removeSqlQueryPart($name)
@@ -515,10 +499,8 @@ public function removeSqlQueryPart($name)
      * removeDqlQueryPart
      * removes a dql query part from the dql query part array.
      *
-     * @param string $name the name of the query part to be removed
-     *
-     * @return $this this object
-     *
+     * @param  string                   $name the name of the query part to be removed
+     * @return $this                    this object
      * @throws Doctrine_Query_Exception if trying to remove unknown query part
      */
     public function removeDqlQueryPart($name)
@@ -550,8 +532,7 @@ public function getParams()
      * Get flattened array of parameters for query.
      * Used internally and used to pass flat array of params to the database.
      *
-     * @param array $params
-     *
+     * @param  array $params
      * @return array
      */
     public function getFlattenedParams($params = array())
@@ -569,8 +550,7 @@ public function getFlattenedParams($params = array())
     /**
      * getInternalParams.
      *
-     * @param array $params
-     *
+     * @param  array $params
      * @return array
      */
     public function getInternalParams($params = array())
@@ -590,8 +570,7 @@ public function setParams(array $params = array())
      * getCountQueryParams
      * Retrieves the parameters for count query.
      *
-     * @param array $params
-     *
+     * @param  array $params
      * @return array Parameters array
      */
     public function getCountQueryParams($params = array())
@@ -672,10 +651,8 @@ public function isLimitSubqueryUsed()
      * The condition is applied to the FROM component in the WHERE, but the condition is applied to
      * JOINS in the ON condition and not the WHERE
      *
-     * @param string $componentAlias
-     *
-     * @return string|null $str SQL condition string
-     *
+     * @param  string                   $componentAlias
+     * @return string|null              $str SQL condition string
      * @throws Doctrine_Query_Exception
      */
     public function getInheritanceCondition($componentAlias)
@@ -720,11 +697,9 @@ public function getInheritanceCondition($componentAlias)
      * this method is used for the creation of short table aliases, its also
      * smart enough to check if an alias already exists for given component (componentAlias)
      *
-     * @param string $componentAlias the alias for the query component to search table alias for
-     * @param string $tableName      the table name from which the table alias is being created
-     *
-     * @return string the generated / fetched short alias
-     *
+     * @param  string                   $componentAlias the alias for the query component to search table alias for
+     * @param  string                   $tableName      the table name from which the table alias is being created
+     * @return string                   the generated / fetched short alias
      * @throws Doctrine_Query_Exception
      */
     public function getSqlTableAlias($componentAlias, $tableName = null)
@@ -746,8 +721,7 @@ public function getSqlTableAlias($componentAlias, $tableName = null)
      * generateNewSqlTableAlias
      * generates a new alias from given table alias.
      *
-     * @param string $oldAlias table alias from which to generate the new alias from
-     *
+     * @param  string $oldAlias table alias from which to generate the new alias from
      * @return string the created table alias
      */
     public function generateNewSqlTableAlias($oldAlias)
@@ -774,9 +748,8 @@ public function generateNewSqlTableAlias($oldAlias)
      * getSqlTableAliasSeed
      * returns the alias seed for given table alias.
      *
-     * @param string $sqlTableAlias table alias that identifies the alias seed
-     *
-     * @return int table alias seed
+     * @param  string $sqlTableAlias table alias that identifies the alias seed
+     * @return int    table alias seed
      */
     public function getSqlTableAliasSeed($sqlTableAlias)
     {
@@ -791,8 +764,7 @@ public function getSqlTableAliasSeed($sqlTableAlias)
      * hasAliasDeclaration
      * whether or not this object has a declaration for given component alias.
      *
-     * @param string $componentAlias the component alias the retrieve the declaration from
-     *
+     * @param  string $componentAlias the component alias the retrieve the declaration from
      * @return bool
      */
     public function hasAliasDeclaration($componentAlias)
@@ -804,10 +776,8 @@ public function hasAliasDeclaration($componentAlias)
      * getQueryComponent
      * get the declaration for given component alias.
      *
-     * @param string $componentAlias the component alias the retrieve the declaration from
-     *
-     * @return array the alias declaration
-     *
+     * @param  string                   $componentAlias the component alias the retrieve the declaration from
+     * @return array                    the alias declaration
      * @throws Doctrine_Query_Exception
      */
     public function getQueryComponent($componentAlias)
@@ -826,10 +796,9 @@ public function getQueryComponent($componentAlias)
      * this method is needed by DQL subqueries which need the aliases
      * of the parent query
      *
-     * @param Doctrine_Query_Abstract $query the query object from which the
-     *                                       aliases are copied from
-     *
-     * @return $this this object
+     * @param  Doctrine_Query_Abstract $query the query object from which the
+     *                                        aliases are copied from
+     * @return $this                   this object
      */
     public function copySubqueryInfo(Doctrine_Query_Abstract $query)
     {
@@ -871,8 +840,7 @@ public function getRootDeclaration()
      * getRoot
      * returns the root component for this object.
      *
-     * @return Doctrine_Table root components table
-     *
+     * @return Doctrine_Table           root components table
      * @throws Doctrine_Query_Exception
      */
     public function getRoot()
@@ -891,9 +859,8 @@ public function getRoot()
      * generates a table alias from given table name and associates
      * it with given component alias.
      *
-     * @param string $componentAlias the component alias to be associated with generated table alias
-     * @param string $tableName      the table name from which to generate the table alias
-     *
+     * @param  string $componentAlias the component alias to be associated with generated table alias
+     * @param  string $tableName      the table name from which to generate the table alias
      * @return string the generated table alias
      */
     public function generateSqlTableAlias($componentAlias, $tableName)
@@ -923,10 +890,8 @@ public function generateSqlTableAlias($componentAlias, $tableName)
      * getComponentAlias
      * get component alias associated with given table alias.
      *
-     * @param string $sqlTableAlias the SQL table alias that identifies the component alias
-     *
-     * @return string component alias
-     *
+     * @param  string                   $sqlTableAlias the SQL table alias that identifies the component alias
+     * @return string                   component alias
      * @throws Doctrine_Query_Exception
      */
     public function getComponentAlias($sqlTableAlias)
@@ -956,8 +921,7 @@ public function calculateQueryCacheHash()
      * calculateResultCacheHash
      * calculate hash key for result cache.
      *
-     * @param array $params
-     *
+     * @param  array  $params
      * @return string the hash
      */
     public function calculateResultCacheHash($params = array())
@@ -973,8 +937,7 @@ public function calculateResultCacheHash($params = array())
      * Get the result cache hash/key. Returns key set with useResultCache()
      * or generates a unique key from the query automatically.
      *
-     * @param array $params
-     *
+     * @param  array  $params
      * @return string $hash
      */
     public function getResultCacheHash($params = array())
@@ -989,10 +952,8 @@ public function getResultCacheHash($params = array())
     /**
      * _execute.
      *
-     * @param array $params
-     *
-     * @return PDOStatement|int The executed PDOStatement or the number of affected rows
-     *
+     * @param  array                         $params
+     * @return PDOStatement|int              The executed PDOStatement or the number of affected rows
      * @throws Doctrine_Connection_Exception
      * @throws Doctrine_Exception
      */
@@ -1071,11 +1032,9 @@ protected function _execute($params)
      * execute
      * executes the query and populates the data set.
      *
-     * @param array           $params
-     * @param int|string|null $hydrationMode one of the Doctrine_Core::HYDRATE_* constants or null
-     *
-     * @return Doctrine_Collection|array the root collection (the result type depends on the hydrator)
-     *
+     * @param  array                         $params
+     * @param  int|string|null               $hydrationMode one of the Doctrine_Core::HYDRATE_* constants or null
+     * @return Doctrine_Collection|array     the root collection (the result type depends on the hydrator)
      * @throws Doctrine_Connection_Exception
      * @throws Doctrine_Hydrator_Exception
      * @throws Doctrine_Query_Exception
@@ -1183,8 +1142,7 @@ protected function _getDqlCallback()
      * Pre query method which invokes the pre*Query() methods on the model instance or any attached
      * record listeners.
      *
-     * @param array $params
-     *
+     * @param  array                         $params
      * @throws Doctrine_Connection_Exception
      */
     protected function _preQuery($params = array())
@@ -1219,8 +1177,7 @@ protected function _preQuery($params = array())
     /**
      * Returns an array of components to execute the query callbacks for.
      *
-     * @param array $params
-     *
+     * @param  array $params
      * @return array $components
      */
     protected function _getDqlCallbackComponents($params = array())
@@ -1256,7 +1213,6 @@ public function preQuery()
      * Constructs the query from the cached form.
      *
      * @param string  the cached query, in a serialized form
-     *
      * @return array The custom component that was cached together with the essential
      *               query data. This can be either a result set (result caching)
      *               or an SQL query string (query caching).
@@ -1301,9 +1257,8 @@ protected function _constructQueryFromCache($cached)
      * getCachedForm
      * returns the cached form of this query for given resultSet.
      *
-     * @param array|Doctrine_Collection|null $customComponent
-     *
-     * @return string serialized string representation of this query
+     * @param  array|Doctrine_Collection|null $customComponent
+     * @return string                         serialized string representation of this query
      */
     public function getCachedForm($customComponent = null)
     {
@@ -1343,10 +1298,8 @@ public function getCachedForm($customComponent = null)
      * $query->addSelect('COUNT(p.id) as num_phonenumbers');
      * </code>
      *
-     * @param string $select Query SELECT part
-     *
+     * @param  string                   $select Query SELECT part
      * @return $this
-     *
      * @throws Doctrine_Query_Exception
      */
     public function addSelect($select)
@@ -1358,9 +1311,8 @@ public function addSelect($select)
      * addSqlTableAlias
      * adds an SQL table alias and associates it a component alias.
      *
-     * @param string $componentAlias the alias for the query component associated with given tableAlias
-     * @param string $sqlTableAlias  the table alias to be added
-     *
+     * @param  string $componentAlias the alias for the query component associated with given tableAlias
+     * @param  string $sqlTableAlias  the table alias to be added
      * @return $this
      */
     public function addSqlTableAlias($sqlTableAlias, $componentAlias)
@@ -1374,10 +1326,8 @@ public function addSqlTableAlias($sqlTableAlias, $componentAlias)
      * addFrom
      * adds fields to the FROM part of the query.
      *
-     * @param string $from Query FROM part
-     *
+     * @param  string                   $from Query FROM part
      * @return $this
-     *
      * @throws Doctrine_Query_Exception
      */
     public function addFrom($from)
@@ -1388,8 +1338,7 @@ public function addFrom($from)
     /**
      * Alias for @see Doctrine_Query_Abstract::andWhere().
      *
-     * @return $this this object
-     *
+     * @return $this                    this object
      * @throws Doctrine_Query_Exception
      */
     public function addWhere($where, $params = array())
@@ -1403,11 +1352,9 @@ public function addWhere($where, $params = array())
      * $q->andWhere('u.birthDate > ?', '1975-01-01');
      * </code>.
      *
-     * @param string $where  Query WHERE part
-     * @param mixed  $params An array of parameters or a simple scalar
-     *
+     * @param  string                   $where  Query WHERE part
+     * @param  mixed                    $params An array of parameters or a simple scalar
      * @return $this
-     *
      * @throws Doctrine_Query_Exception
      */
     public function andWhere($where, $params = array())
@@ -1431,11 +1378,9 @@ public function andWhere($where, $params = array())
      * $q->orWhere('u.role = ?', 'admin');
      * </code>.
      *
-     * @param string $where  Query WHERE part
-     * @param mixed  $params An array of parameters or a simple scalar
-     *
+     * @param  string                   $where  Query WHERE part
+     * @param  mixed                    $params An array of parameters or a simple scalar
      * @return $this
-     *
      * @throws Doctrine_Query_Exception
      */
     public function orWhere($where, $params = array())
@@ -1456,12 +1401,10 @@ public function orWhere($where, $params = array())
     /**
      * Adds IN condition to the query WHERE part. Alias to @see andWhereIn().
      *
-     * @param string $expr   the operand of the IN
-     * @param mixed  $params an array of parameters or a simple scalar
-     * @param bool   $not    whether or not to use NOT in front of IN
-     *
+     * @param  string                   $expr   the operand of the IN
+     * @param  mixed                    $params an array of parameters or a simple scalar
+     * @param  bool                     $not    whether or not to use NOT in front of IN
      * @return $this
-     *
      * @throws Doctrine_Query_Exception
      */
     public function whereIn($expr, $params = array(), $not = false)
@@ -1475,12 +1418,10 @@ public function whereIn($expr, $params = array(), $not = false)
      * $q->whereIn('u.id', array(10, 23, 44));
      * </code>.
      *
-     * @param string $expr   The operand of the IN
-     * @param mixed  $params An array of parameters or a simple scalar
-     * @param bool   $not    Whether or not to use NOT in front of IN. Defaults to false (simple IN clause)
-     *
-     * @return $this this object
-     *
+     * @param  string                   $expr   The operand of the IN
+     * @param  mixed                    $params An array of parameters or a simple scalar
+     * @param  bool                     $not    Whether or not to use NOT in front of IN. Defaults to false (simple IN clause)
+     * @return $this                    this object
      * @throws Doctrine_Query_Exception
      */
     public function andWhereIn($expr, $params = array(), $not = false)
@@ -1505,12 +1446,10 @@ public function andWhereIn($expr, $params = array(), $not = false)
      * // will select all record with id equal to 10, 23 or 44
      * </code>.
      *
-     * @param string $expr   The operand of the IN
-     * @param mixed  $params An array of parameters or a simple scalar
-     * @param bool   $not    Whether or not to use NOT in front of IN
-     *
+     * @param  string                   $expr   The operand of the IN
+     * @param  mixed                    $params An array of parameters or a simple scalar
+     * @param  bool                     $not    Whether or not to use NOT in front of IN
      * @return $this
-     *
      * @throws Doctrine_Query_Exception
      */
     public function orWhereIn($expr, $params = array(), $not = false)
@@ -1562,11 +1501,9 @@ protected function _processWhereIn($expr, $params = array(), $not = false)
      * // will exclude users with id 10 and 20 from the select
      * </code>.
      *
-     * @param string $expr   the operand of the NOT IN
-     * @param mixed  $params an array of parameters or a simple scalar
-     *
-     * @return $this this object
-     *
+     * @param  string                   $expr   the operand of the NOT IN
+     * @param  mixed                    $params an array of parameters or a simple scalar
+     * @return $this                    this object
      * @throws Doctrine_Query_Exception
      */
     public function whereNotIn($expr, $params = array())
@@ -1578,11 +1515,9 @@ public function whereNotIn($expr, $params = array())
      * Adds NOT IN condition to the query WHERE part
      * Alias for @see whereNotIn().
      *
-     * @param string $expr   The operand of the NOT IN
-     * @param mixed  $params An array of parameters or a simple scalar
-     *
+     * @param  string                   $expr   The operand of the NOT IN
+     * @param  mixed                    $params An array of parameters or a simple scalar
      * @return $this
-     *
      * @throws Doctrine_Query_Exception
      */
     public function andWhereNotIn($expr, $params = array())
@@ -1593,11 +1528,9 @@ public function andWhereNotIn($expr, $params = array())
     /**
      * Adds NOT IN condition to the query WHERE part.
      *
-     * @param string $expr   The operand of the NOT IN
-     * @param mixed  $params An array of parameters or a simple scalar
-     *
+     * @param  string                   $expr   The operand of the NOT IN
+     * @param  mixed                    $params An array of parameters or a simple scalar
      * @return $this
-     *
      * @throws Doctrine_Query_Exception
      */
     public function orWhereNotIn($expr, $params = array())
@@ -1611,10 +1544,8 @@ public function orWhereNotIn($expr, $params = array())
      * $q->groupBy('u.id');
      * </code>.
      *
-     * @param string $groupby Query GROUP BY part
-     *
+     * @param  string                   $groupby Query GROUP BY part
      * @return $this
-     *
      * @throws Doctrine_Query_Exception
      */
     public function addGroupBy($groupby)
@@ -1631,11 +1562,9 @@ public function addGroupBy($groupby)
      * $q->having('num_phonenumbers > ?', 1);
      * </code>
      *
-     * @param string $having Query HAVING part
-     * @param mixed  $params an array of parameters or a simple scalar
-     *
+     * @param  string                   $having Query HAVING part
+     * @param  mixed                    $params an array of parameters or a simple scalar
      * @return $this
-     *
      * @throws Doctrine_Query_Exception
      */
     public function addHaving($having, $params = array())
@@ -1653,10 +1582,8 @@ public function addHaving($having, $params = array())
      * addOrderBy
      * adds fields to the ORDER BY part of the query.
      *
-     * @param string $orderby Query ORDER BY part
-     *
+     * @param  string                   $orderby Query ORDER BY part
      * @return $this
-     *
      * @throws Doctrine_Query_Exception
      */
     public function addOrderBy($orderby)
@@ -1668,10 +1595,8 @@ public function addOrderBy($orderby)
      * select
      * sets the SELECT part of the query.
      *
-     * @param string $select Query SELECT part
-     *
+     * @param  string                   $select Query SELECT part
      * @return $this
-     *
      * @throws Doctrine_Query_Exception
      */
     public function select($select = null)
@@ -1691,8 +1616,7 @@ public function select($select = null)
      * $q->distinct();
      * </code>.
      *
-     * @param bool $flag whether or not the SELECT is DISTINCT (default true)
-     *
+     * @param  bool  $flag whether or not the SELECT is DISTINCT (default true)
      * @return $this
      */
     public function distinct($flag = true)
@@ -1706,8 +1630,7 @@ public function distinct($flag = true)
      * forUpdate
      * Makes the query SELECT FOR UPDATE.
      *
-     * @param bool $flag whether or not the SELECT is FOR UPDATE (default true)
-     *
+     * @param  bool  $flag whether or not the SELECT is FOR UPDATE (default true)
      * @return $this
      */
     public function forUpdate($flag = true)
@@ -1721,10 +1644,8 @@ public function forUpdate($flag = true)
      * delete
      * sets the query type to DELETE.
      *
-     * @param string|null $from
-     *
+     * @param  string|null              $from
      * @return $this
-     *
      * @throws Doctrine_Query_Exception
      */
     public function delete($from = null)
@@ -1741,10 +1662,8 @@ public function delete($from = null)
      * update
      * sets the UPDATE part of the query.
      *
-     * @param string|null $from Query UPDATE part
-     *
+     * @param  string|null              $from Query UPDATE part
      * @return $this
-     *
      * @throws Doctrine_Query_Exception
      */
     public function update($from = null)
@@ -1763,15 +1682,13 @@ public function update($from = null)
      *
      * NOTE: best way is to use: $query->set(array('key' => 'value', ...))
      *
-     * @param string|array $key    either field name or array(<key> => <value>, ...)
-     * @param string|null  $value  will be ignored if $key is an array. placeholder '?' or a concrete value like NULL
-     *                             or DATE()
-     * @param mixed|null   $params if $value is '?' this defines the value which replaces ?.
-     *                             Attention: null will be ignored. if you want to set something to null use set('key',
-     *                             '?', array(null)) or set(array('key' => null))
-     *
+     * @param  string|array             $key    either field name or array(<key> => <value>, ...)
+     * @param  string|null              $value  will be ignored if $key is an array. placeholder '?' or a concrete value like NULL
+     *                                          or DATE()
+     * @param  mixed|null               $params if $value is '?' this defines the value which replaces ?.
+     *                                          Attention: null will be ignored. if you want to set something to null use set('key',
+     *                                          '?', array(null)) or set(array('key' => null))
      * @return $this
-     *
      * @throws Doctrine_Query_Exception
      */
     public function set($key, $value = null, $params = null)
@@ -1801,10 +1718,8 @@ public function set($key, $value = null, $params = null)
      * $q->from('User u');
      * </code>.
      *
-     * @param string $from Query FROM part
-     *
+     * @param  string                   $from Query FROM part
      * @return $this
-     *
      * @throws Doctrine_Query_Exception
      */
     public function from($from)
@@ -1816,10 +1731,8 @@ public function from($from)
      * innerJoin
      * appends an INNER JOIN to the FROM part of the query.
      *
-     * @param string $join Query INNER JOIN
-     *
+     * @param  string                   $join Query INNER JOIN
      * @return $this
-     *
      * @throws Doctrine_Query_Exception
      */
     public function innerJoin($join, $params = array())
@@ -1837,10 +1750,8 @@ public function innerJoin($join, $params = array())
      * leftJoin
      * appends a LEFT JOIN to the FROM part of the query.
      *
-     * @param string $join Query LEFT JOIN
-     *
+     * @param  string                   $join Query LEFT JOIN
      * @return $this
-     *
      * @throws Doctrine_Query_Exception
      */
     public function leftJoin($join, $params = array())
@@ -1858,10 +1769,8 @@ public function leftJoin($join, $params = array())
      * groupBy
      * sets the GROUP BY part of the query.
      *
-     * @param string $groupby Query GROUP BY part
-     *
+     * @param  string                   $groupby Query GROUP BY part
      * @return $this
-     *
      * @throws Doctrine_Query_Exception
      */
     public function groupBy($groupby)
@@ -1873,11 +1782,9 @@ public function groupBy($groupby)
      * where
      * sets the WHERE part of the query.
      *
-     * @param string $where  Query WHERE part
-     * @param mixed  $params an array of parameters or a simple scalar
-     *
+     * @param  string                   $where  Query WHERE part
+     * @param  mixed                    $params an array of parameters or a simple scalar
      * @return $this
-     *
      * @throws Doctrine_Query_Exception
      */
     public function where($where, $params = array())
@@ -1897,11 +1804,9 @@ public function where($where, $params = array())
      * having
      * sets the HAVING part of the query.
      *
-     * @param string $having Query HAVING part
-     * @param mixed  $params an array of parameters or a simple scalar
-     *
+     * @param  string                   $having Query HAVING part
+     * @param  mixed                    $params an array of parameters or a simple scalar
      * @return $this
-     *
      * @throws Doctrine_Query_Exception
      */
     public function having($having, $params = array())
@@ -1923,10 +1828,8 @@ public function having($having, $params = array())
      * $query->orderBy('u.birthDate DESC');
      * </code>.
      *
-     * @param string $orderby Query ORDER BY part
-     *
+     * @param  string                   $orderby Query ORDER BY part
      * @return $this
-     *
      * @throws Doctrine_Query_Exception
      */
     public function orderBy($orderby)
@@ -1938,10 +1841,8 @@ public function orderBy($orderby)
      * limit
      * sets the Query query limit.
      *
-     * @param int $limit limit to be used for limiting the query results
-     *
+     * @param  int                      $limit limit to be used for limiting the query results
      * @return $this
-     *
      * @throws Doctrine_Query_Exception
      */
     public function limit($limit)
@@ -1953,10 +1854,8 @@ public function limit($limit)
      * offset
      * sets the Query query offset.
      *
-     * @param int $offset offset to be used for paginating the query
-     *
+     * @param  int                      $offset offset to be used for paginating the query
      * @return $this
-     *
      * @throws Doctrine_Query_Exception
      */
     public function offset($offset)
@@ -2032,12 +1931,10 @@ public function getType()
     /**
      * useResultCache.
      *
-     * @param bool|Doctrine_Cache_Interface|null $driver          cache driver (true: use default driver | null: disable caching)
-     * @param int                                $timeToLive      (in sec) how long the cache entry is valid
-     * @param string                             $resultCacheHash The key to use for storing the queries result cache entry
-     *
-     * @return $this this object
-     *
+     * @param  bool|Doctrine_Cache_Interface|null $driver          cache driver (true: use default driver | null: disable caching)
+     * @param  int                                $timeToLive      (in sec) how long the cache entry is valid
+     * @param  string                             $resultCacheHash The key to use for storing the queries result cache entry
+     * @return $this                              this object
      * @throws Doctrine_Query_Exception
      */
     public function useResultCache($driver = true, $timeToLive = null, $resultCacheHash = null)
@@ -2059,8 +1956,7 @@ public function useResultCache($driver = true, $timeToLive = null, $resultCacheH
     /**
      * Set the result cache hash to be used for storing the results in the cache driver.
      *
-     * @param string $resultCacheHash
-     *
+     * @param  string $resultCacheHash
      * @return $this
      */
     public function setResultCacheHash($resultCacheHash)
@@ -2074,7 +1970,6 @@ public function setResultCacheHash($resultCacheHash)
      * Clear the result cache entry for this query.
      *
      * @return $this
-     *
      * @throws Doctrine_Exception
      */
     public function clearResultCache()
@@ -2089,11 +1984,9 @@ public function clearResultCache()
     /**
      * useQueryCache.
      *
-     * @param Doctrine_Cache_Interface|bool $driver     cache driver
-     * @param int                           $timeToLive how long the cache entry is valid
-     *
-     * @return $this this object
-     *
+     * @param  Doctrine_Cache_Interface|bool $driver     cache driver
+     * @param  int                           $timeToLive how long the cache entry is valid
+     * @return $this                         this object
      * @throws Doctrine_Query_Exception
      */
     public function useQueryCache($driver = true, $timeToLive = null)
@@ -2114,8 +2007,7 @@ public function useQueryCache($driver = true, $timeToLive = null)
     /**
      * expireCache.
      *
-     * @param bool $expire whether or not to force cache expiration
-     *
+     * @param  bool  $expire whether or not to force cache expiration
      * @return $this this object
      */
     public function expireResultCache($expire = true)
@@ -2128,8 +2020,7 @@ public function expireResultCache($expire = true)
     /**
      * expireQueryCache.
      *
-     * @param bool $expire whether or not to force cache expiration
-     *
+     * @param  bool  $expire whether or not to force cache expiration
      * @return $this this object
      */
     public function expireQueryCache($expire = true)
@@ -2142,8 +2033,7 @@ public function expireQueryCache($expire = true)
     /**
      * setResultCacheLifeSpan.
      *
-     * @param int $timeToLive how long the cache entry is valid (in seconds)
-     *
+     * @param  int   $timeToLive how long the cache entry is valid (in seconds)
      * @return $this this object
      */
     public function setResultCacheLifeSpan($timeToLive)
@@ -2169,8 +2059,7 @@ public function getResultCacheLifeSpan()
     /**
      * setQueryCacheLifeSpan.
      *
-     * @param int $timeToLive how long the cache entry is valid
-     *
+     * @param  int   $timeToLive how long the cache entry is valid
      * @return $this this object
      */
     public function setQueryCacheLifeSpan($timeToLive)
@@ -2198,7 +2087,6 @@ public function getQueryCacheLifeSpan()
      * returns the cache driver used for caching result sets.
      *
      * @return Doctrine_Cache_Interface|bool|null cache driver
-     *
      * @throws Doctrine_Exception
      */
     public function getResultCacheDriver()
@@ -2215,7 +2103,6 @@ public function getResultCacheDriver()
      * returns the cache driver used for caching queries.
      *
      * @return Doctrine_Cache_Interface|bool|null cache driver
-     *
      * @throws Doctrine_Exception
      */
     public function getQueryCacheDriver()
@@ -2240,8 +2127,7 @@ public function getConnection()
     /**
      * Checks if there's at least one DQL part defined to the internal parts collection.
      *
-     * @param string $queryPartName the name of the query part
-     *
+     * @param  string $queryPartName the name of the query part
      * @return bool
      */
     protected function _hasDqlQueryPart($queryPartName)
@@ -2258,14 +2144,12 @@ protected function _hasDqlQueryPart($queryPartName)
      * @see $_dqlParts;
      * @see Doctrine_Query::getDqlPart()
      *
-     * @param string $queryPartName the name of the query part
-     * @param string $queryPart     the actual query part to add
-     * @param bool   $append        Whether to append $queryPart to already existing
-     *                              parts under the same $queryPartName. Defaults to FALSE
-     *                              (previously added parts with the same name get overridden).
-     *
+     * @param  string                   $queryPartName the name of the query part
+     * @param  string                   $queryPart     the actual query part to add
+     * @param  bool                     $append        Whether to append $queryPart to already existing
+     *                                                 parts under the same $queryPartName. Defaults to FALSE
+     *                                                 (previously added parts with the same name get overridden).
      * @return $this
-     *
      * @throws Doctrine_Query_Exception
      */
     protected function _addDqlQueryPart($queryPartName, $queryPart, $append = false)
@@ -2322,7 +2206,6 @@ protected function _processDqlQueryPart($queryPartName, $queryParts)
      * parser lazy-loader.
      *
      * @return Doctrine_Query_Part
-     *
      * @throws Doctrine_Query_Exception if unknown parser name given
      *
      * @todo Doc/Description: What is the parameter for? Which parsers are available?
@@ -2349,8 +2232,7 @@ protected function _getParser($name)
      * The returned SQL syntax depends on the connection driver that is used
      * by this query object at the time of this method call.
      *
-     * @param array $params
-     *
+     * @param  array  $params
      * @return string
      */
     abstract public function getSqlQuery($params = array());
@@ -2359,9 +2241,8 @@ abstract public function getSqlQuery($params = array());
      * parseDqlQuery
      * parses a dql query.
      *
-     * @param string $query query to be parsed
-     *
-     * @return $this this object
+     * @param  string $query query to be parsed
+     * @return $this  this object
      */
     abstract public function parseDqlQuery($query);
 
diff --git a/lib/Doctrine/Query/Check.php b/lib/Doctrine/Query/Check.php
index 7c87e3942..c06aed66c 100644
--- a/lib/Doctrine/Query/Check.php
+++ b/lib/Doctrine/Query/Check.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Query_Check.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 1080 $
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
@@ -75,8 +70,7 @@ public function getTable()
     /**
      * parse.
      *
-     * @param string $dql DQL CHECK constraint definition
-     *
+     * @param  string $dql DQL CHECK constraint definition
      * @return string
      */
     public function parse($dql)
diff --git a/lib/Doctrine/Query/Condition.php b/lib/Doctrine/Query/Condition.php
index 7de528c3f..9986a9e70 100644
--- a/lib/Doctrine/Query/Condition.php
+++ b/lib/Doctrine/Query/Condition.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Query_Condition.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7490 $
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
@@ -37,8 +32,7 @@ abstract class Doctrine_Query_Condition extends Doctrine_Query_Part
      * DQL CONDITION PARSER
      * parses the join condition/where/having part of the query string.
      *
-     * @param string $str
-     *
+     * @param  string $str
      * @return string
      */
     public function parse($str)
@@ -105,8 +99,7 @@ public function parse($str)
      * boolean literals are parsed to integers
      * components are parsed to associated table aliases
      *
-     * @param string $value literal value to be parsed
-     *
+     * @param  string $value literal value to be parsed
      * @return string
      */
     public function parseLiteralValue($value)
diff --git a/lib/Doctrine/Query/Exception.php b/lib/Doctrine/Query/Exception.php
index d02e037a0..89e78c07e 100644
--- a/lib/Doctrine/Query/Exception.php
+++ b/lib/Doctrine/Query/Exception.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Query_Exception.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7490 $
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
diff --git a/lib/Doctrine/Query/Filter.php b/lib/Doctrine/Query/Filter.php
index b831bba49..aeb897b76 100644
--- a/lib/Doctrine/Query/Filter.php
+++ b/lib/Doctrine/Query/Filter.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Query_Filter.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
diff --git a/lib/Doctrine/Query/Filter/Chain.php b/lib/Doctrine/Query/Filter/Chain.php
index 3cdc4fafc..66228a72a 100644
--- a/lib/Doctrine/Query/Filter/Chain.php
+++ b/lib/Doctrine/Query/Filter/Chain.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Query_Filter_Chain.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
diff --git a/lib/Doctrine/Query/Filter/Interface.php b/lib/Doctrine/Query/Filter/Interface.php
index 9258d3a0c..79a8e17d7 100644
--- a/lib/Doctrine/Query/Filter/Interface.php
+++ b/lib/Doctrine/Query/Filter/Interface.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Query_Filter_Interface.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
diff --git a/lib/Doctrine/Query/Forupdate.php b/lib/Doctrine/Query/Forupdate.php
index d51c7fd53..14cc1c3f7 100644
--- a/lib/Doctrine/Query/Forupdate.php
+++ b/lib/Doctrine/Query/Forupdate.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Query_Forupdate.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 1352 $
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
diff --git a/lib/Doctrine/Query/From.php b/lib/Doctrine/Query/From.php
index df6c28037..ebd6f7977 100644
--- a/lib/Doctrine/Query/From.php
+++ b/lib/Doctrine/Query/From.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Query_From.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7490 $
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
diff --git a/lib/Doctrine/Query/Groupby.php b/lib/Doctrine/Query/Groupby.php
index 82c05096a..496742293 100644
--- a/lib/Doctrine/Query/Groupby.php
+++ b/lib/Doctrine/Query/Groupby.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Query_Groupby.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7490 $
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
diff --git a/lib/Doctrine/Query/Having.php b/lib/Doctrine/Query/Having.php
index c68f76775..730ea28fb 100644
--- a/lib/Doctrine/Query/Having.php
+++ b/lib/Doctrine/Query/Having.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Query_Having.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7666 $
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
@@ -102,8 +97,7 @@ private function _parseAliases($value)
      * load
      * returns the parsed query part.
      *
-     * @param string $having
-     *
+     * @param  string $having
      * @return string
      */
     final public function load($having)
diff --git a/lib/Doctrine/Query/JoinCondition.php b/lib/Doctrine/Query/JoinCondition.php
index 66413bd79..2a1dd67d5 100644
--- a/lib/Doctrine/Query/JoinCondition.php
+++ b/lib/Doctrine/Query/JoinCondition.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Query_JoinCondition.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7490 $
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
diff --git a/lib/Doctrine/Query/Limit.php b/lib/Doctrine/Query/Limit.php
index f2094141e..a55bcb58f 100644
--- a/lib/Doctrine/Query/Limit.php
+++ b/lib/Doctrine/Query/Limit.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Query_Limit.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 1352 $
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
diff --git a/lib/Doctrine/Query/Offset.php b/lib/Doctrine/Query/Offset.php
index c47dd6869..ad6468506 100644
--- a/lib/Doctrine/Query/Offset.php
+++ b/lib/Doctrine/Query/Offset.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Query_Offset.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 1352 $
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
diff --git a/lib/Doctrine/Query/Orderby.php b/lib/Doctrine/Query/Orderby.php
index 639c98193..42af2aa5e 100644
--- a/lib/Doctrine/Query/Orderby.php
+++ b/lib/Doctrine/Query/Orderby.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Query_Orderby.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7490 $
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
diff --git a/lib/Doctrine/Query/Parser.php b/lib/Doctrine/Query/Parser.php
index 2d64bf707..dc1ae3513 100644
--- a/lib/Doctrine/Query/Parser.php
+++ b/lib/Doctrine/Query/Parser.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Query_Parser.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  */
 class Doctrine_Query_Parser
 {
diff --git a/lib/Doctrine/Query/Part.php b/lib/Doctrine/Query/Part.php
index 1d0293d78..63b641d97 100644
--- a/lib/Doctrine/Query/Part.php
+++ b/lib/Doctrine/Query/Part.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Query_Part.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7490 $
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
diff --git a/lib/Doctrine/Query/Registry.php b/lib/Doctrine/Query/Registry.php
index 0d9f5d9f1..a5b3c7959 100644
--- a/lib/Doctrine/Query/Registry.php
+++ b/lib/Doctrine/Query/Registry.php
@@ -23,12 +23,8 @@
  * Doctrine_Query_Registry.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  */
 class Doctrine_Query_Registry
 {
diff --git a/lib/Doctrine/Query/Registry/Exception.php b/lib/Doctrine/Query/Registry/Exception.php
index 354b2719d..15c240697 100644
--- a/lib/Doctrine/Query/Registry/Exception.php
+++ b/lib/Doctrine/Query/Registry/Exception.php
@@ -23,12 +23,8 @@
  * Doctrine_Query_Exception.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  */
 class Doctrine_Query_Registry_Exception extends Doctrine_Query_Exception
 {
diff --git a/lib/Doctrine/Query/Select.php b/lib/Doctrine/Query/Select.php
index 8490feb61..3b93acafb 100644
--- a/lib/Doctrine/Query/Select.php
+++ b/lib/Doctrine/Query/Select.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Query_Select.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 1080 $
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
diff --git a/lib/Doctrine/Query/Set.php b/lib/Doctrine/Query/Set.php
index 4e9d30344..7326b03c3 100644
--- a/lib/Doctrine/Query/Set.php
+++ b/lib/Doctrine/Query/Set.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Query.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7490 $
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
diff --git a/lib/Doctrine/Query/Tokenizer.php b/lib/Doctrine/Query/Tokenizer.php
index a72a9aa41..3970edf6e 100644
--- a/lib/Doctrine/Query/Tokenizer.php
+++ b/lib/Doctrine/Query/Tokenizer.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Query_Tokenizer.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  * @author      Guilherme Blanco <guilhermeblanco@hotmail.com>
@@ -50,10 +45,8 @@ class Doctrine_Query_Tokenizer
      *         'where'  => array('u.name', 'LIKE', '?')
      *     );
      *
-     * @param string $query DQL query
-     *
-     * @return array An array containing the query string parts
-     *
+     * @param  string                   $query DQL query
+     * @return array                    An array containing the query string parts
      * @throws Doctrine_Query_Exception If some generic parsing error occurs
      */
     public function tokenizeQuery($query)
@@ -111,10 +104,9 @@ public function tokenizeQuery($query)
     /**
      * Trims brackets from string.
      *
-     * @param string $str String to remove the brackets
-     * @param string $e1  First bracket, usually '('
-     * @param string $e2  Second bracket, usually ')'
-     *
+     * @param  string $str String to remove the brackets
+     * @param  string $e1  First bracket, usually '('
+     * @param  string $e2  Second bracket, usually ')'
      * @return string
      */
     public function bracketTrim($str, $e1 = '(', $e2 = ')')
@@ -140,11 +132,10 @@ public function bracketTrim($str, $e1 = '(', $e2 = ')')
      * // array("(age < 20 AND age > 18)", "email LIKE 'John@example.com'")
      * </code>
      *
-     * @param string $str String to be bracket exploded
-     * @param string $d   Delimeter which explodes the string
-     * @param string $e1  First bracket, usually '('
-     * @param string $e2  Second bracket, usually ')'
-     *
+     * @param  string $str String to be bracket exploded
+     * @param  string $d   Delimeter which explodes the string
+     * @param  string $e1  First bracket, usually '('
+     * @param  string $e2  Second bracket, usually ')'
      * @return array
      */
     public function bracketExplode($str, $d = ' ', $e1 = '(', $e2 = ')')
@@ -181,9 +172,8 @@ public function bracketExplode($str, $d = ' ', $e1 = '(', $e2 = ')')
      * would return an array:
      *     array("email", "LIKE", "'John@example.com'")
      *
-     * @param string $str String to be quote exploded
-     * @param string $d   Delimeter which explodes the string
-     *
+     * @param  string $str String to be quote exploded
+     * @param  string $d   Delimeter which explodes the string
      * @return array
      */
     public function quoteExplode($str, $d = ' ')
@@ -227,11 +217,10 @@ public function quoteExplode($str, $d = ' ')
      *         'John Doe'
      *     );
      *
-     * @param string $str String to be SQL exploded
-     * @param string $d   Delimeter which explodes the string
-     * @param string $e1  First bracket, usually '('
-     * @param string $e2  Second bracket, usually ')'
-     *
+     * @param  string $str String to be SQL exploded
+     * @param  string $d   Delimeter which explodes the string
+     * @param  string $e1  First bracket, usually '('
+     * @param  string $e2  Second bracket, usually ')'
      * @return array
      */
     public function sqlExplode($str, $d = ' ', $e1 = '(', $e2 = ')')
@@ -273,11 +262,10 @@ public function sqlExplode($str, $d = ' ', $e1 = '(', $e2 = ')')
      *         array(' Doe', '')
      *     );
      *
-     * @param string $str String to be clause exploded
-     * @param string $d   Delimeter which explodes the string
-     * @param string $e1  First bracket, usually '('
-     * @param string $e2  Second bracket, usually ')'
-     *
+     * @param  string $str String to be clause exploded
+     * @param  string $d   Delimeter which explodes the string
+     * @param  string $e1  First bracket, usually '('
+     * @param  string $e2  Second bracket, usually ')'
      * @return array
      */
     public function clauseExplode($str, array $d, $e1 = '(', $e2 = ')')
@@ -446,8 +434,7 @@ private function clauseExplodeNonQuoted($str, $regexp)
      *         array('5'    , '' , 0)
      *     );
      *
-     * @param $terms array
-     *
+     * @param        $terms array
      * @return array
      */
     private function mergeBracketTerms(array $terms)
@@ -486,8 +473,7 @@ private function mergeBracketTerms(array $terms)
      *
      * Note the trailing empty string. In the result, all even elements are quoted strings.
      *
-     * @param $str the string to split
-     *
+     * @param        $str the string to split
      * @return array
      */
     public function quotedStringExplode($str)
diff --git a/lib/Doctrine/Query/Tokenizer/Exception.php b/lib/Doctrine/Query/Tokenizer/Exception.php
index b4e46d647..ee93596be 100644
--- a/lib/Doctrine/Query/Tokenizer/Exception.php
+++ b/lib/Doctrine/Query/Tokenizer/Exception.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Query_Exception.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 2702 $
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
diff --git a/lib/Doctrine/Query/Where.php b/lib/Doctrine/Query/Where.php
index bc6e20c60..ed303bf08 100644
--- a/lib/Doctrine/Query/Where.php
+++ b/lib/Doctrine/Query/Where.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Query_Where.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7672 $
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
@@ -155,9 +150,8 @@ protected function _buildWhereInArraySqlPart($rightExpr)
     /**
      * parses an EXISTS expression.
      *
-     * @param string $where    query where part to be parsed
-     * @param bool   $negation whether or not to use the NOT keyword
-     *
+     * @param  string $where    query where part to be parsed
+     * @param  bool   $negation whether or not to use the NOT keyword
      * @return string
      */
     public function parseExists($where, $negation)
diff --git a/lib/Doctrine/RawSql.php b/lib/Doctrine/RawSql.php
index 8488201c4..82a330c07 100644
--- a/lib/Doctrine/RawSql.php
+++ b/lib/Doctrine/RawSql.php
@@ -28,12 +28,7 @@
  * in a RawSql query is the SELECT part, which has a special syntax that provides Doctrine
  * with the necessary information to properly hydrate the query results.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7490 $
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
@@ -73,12 +68,11 @@ protected function clear()
      * the user of the RawSql query is responsible for writing SQL that is portable between
      * different DBMS.
      *
-     * @param string $queryPartName the name of the query part
-     * @param string $queryPart     query part to be parsed
-     * @param bool   $append        whether or not to append the query part to its stack
-     *                              if false is given, this method will overwrite
-     *                              the given query part stack with $queryPart
-     *
+     * @param  string         $queryPartName the name of the query part
+     * @param  string         $queryPart     query part to be parsed
+     * @param  bool           $append        whether or not to append the query part to its stack
+     *                                       if false is given, this method will overwrite
+     *                                       the given query part stack with $queryPart
      * @return Doctrine_Query this object
      */
     public function parseDqlQueryPart($queryPartName, $queryPart, $append = false)
@@ -129,8 +123,7 @@ private function _parseSelectFields($queryPart)
      * This implementation simply tokenizes the provided query string and uses them
      * as SQL parts right away.
      *
-     * @param string $query query to be parsed
-     *
+     * @param  string          $query query to be parsed
      * @return Doctrine_RawSql this object
      */
     public function parseDqlQuery($query)
@@ -347,9 +340,8 @@ public function getCountSqlQuery($params = array())
      *
      * @see Doctrine_Query::count()
      *
-     * @param array $params an array of prepared statement parameters
-     *
-     * @return int the count of this query
+     * @param  array $params an array of prepared statement parameters
+     * @return int   the count of this query
      */
     public function count($params = array())
     {
@@ -385,8 +377,7 @@ public function getFields()
     /**
      * addComponent.
      *
-     * @param string $tableAlias
-     *
+     * @param  string          $tableAlias
      * @return Doctrine_RawSql
      */
     public function addComponent($tableAlias, $path)
@@ -450,8 +441,7 @@ public function addComponent($tableAlias, $path)
      * calculateResultCacheHash
      * calculate hash key for result cache.
      *
-     * @param array $params
-     *
+     * @param  array  $params
      * @return string the hash
      */
     public function calculateResultCacheHash($params = array())
diff --git a/lib/Doctrine/RawSql/Exception.php b/lib/Doctrine/RawSql/Exception.php
index 82662d5c6..b0a5b5712 100644
--- a/lib/Doctrine/RawSql/Exception.php
+++ b/lib/Doctrine/RawSql/Exception.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_RawSql_Exception.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7490 $
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
diff --git a/lib/Doctrine/Record.php b/lib/Doctrine/Record.php
index 2c17236b4..c02874b1a 100644
--- a/lib/Doctrine/Record.php
+++ b/lib/Doctrine/Record.php
@@ -24,12 +24,8 @@
  * All record classes should inherit this super class.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7673 $
  */
 abstract class Doctrine_Record extends Doctrine_Record_Abstract implements Countable, IteratorAggregate, Serializable
 {
@@ -201,10 +197,9 @@ abstract class Doctrine_Record extends Doctrine_Record_Abstract implements Count
     /**
      * constructor.
      *
-     * @param Doctrine_Table|null $table      a Doctrine_Table object or null,
-     *                                        if null the table object is retrieved from current connection
-     * @param bool                $isNewEntry whether or not this record is transient
-     *
+     * @param  Doctrine_Table|null           $table      a Doctrine_Table object or null,
+     *                                                   if null the table object is retrieved from current connection
+     * @param  bool                          $isNewEntry whether or not this record is transient
      * @throws Doctrine_Connection_Exception if object is created using the new operator and there are no
      *                                       open connections
      * @throws Doctrine_Record_Exception     if the cleanData operation fails somehow
@@ -274,8 +269,7 @@ public function __construct($table = null, $isNewEntry = false)
      * This is used by caching since we want to serialize references when caching
      * but not when just normally serializing a instance.
      *
-     * @param bool $bool
-     *
+     * @param  bool $bool
      * @return bool $bool
      */
     public function serializeReferences($bool = null)
@@ -337,10 +331,9 @@ public function oid()
      * $this->invokeSaveHooks('pre', 'save');
      * </code>
      *
-     * @param string         $when  'post' or 'pre'
-     * @param string         $type  serialize, unserialize, save, delete, update, insert, validate, dqlSelect, dqlDelete, hydrate
-     * @param Doctrine_Event $event event raised
-     *
+     * @param  string         $when  'post' or 'pre'
+     * @param  string         $type  serialize, unserialize, save, delete, update, insert, validate, dqlSelect, dqlDelete, hydrate
+     * @param  Doctrine_Event $event event raised
      * @return Doctrine_Event the event generated using the type, if not specified
      */
     public function invokeSaveHooks($when, $type, $event = null)
@@ -376,9 +369,8 @@ public function clearInvokedSaveHooks()
     /**
      * tests validity of the record using the current data.
      *
-     * @param bool $deep  run the validation process on the relations
-     * @param bool $hooks invoke save hooks before start
-     *
+     * @param  bool $deep  run the validation process on the relations
+     * @param  bool $hooks invoke save hooks before start
      * @return bool whether or not this record is valid
      */
     public function isValid($deep = false, $hooks = true)
@@ -668,8 +660,7 @@ public function getErrorStack()
      * assigns the ErrorStack or returns it if called without parameters.
      *
      * @param Doctrine_Validator_ErrorStack          errorStack to be assigned for this record
-     * @param mixed|null $stack
-     *
+     * @param  mixed|null                         $stack
      * @return void|Doctrine_Validator_ErrorStack returns the errorStack associated with this record
      */
     public function errorStack($stack = null)
@@ -704,8 +695,7 @@ public function assignInheritanceValues()
      * setDefaultValues
      * sets the default values for records internal data.
      *
-     * @param bool $overwrite whether or not to overwrite the already set values
-     *
+     * @param  bool $overwrite whether or not to overwrite the already set values
      * @return bool
      */
     public function assignDefaultValues($overwrite = false)
@@ -734,8 +724,7 @@ public function assignDefaultValues($overwrite = false)
      * record and returns the values that were removed from $data.  Also converts
      * any values of 'null' to objects of type Doctrine_Null.
      *
-     * @param array $data data array to be cleaned
-     *
+     * @param  array $data data array to be cleaned
      * @return array values cleaned from data
      */
     public function cleanData(&$data)
@@ -832,8 +821,7 @@ public function serialize()
     /**
      * this method is automatically called everytime an instance is unserialized.
      *
-     * @param string $serialized Doctrine_Record as serialized string
-     *
+     * @param  string                    $serialized Doctrine_Record as serialized string
      * @throws Doctrine_Record_Exception if the cleanData operation fails somehow
      */
     public function unserialize($serialized)
@@ -958,7 +946,6 @@ public function __unserialize($data)
      * @see Doctrine_Record::STATE_* constants
      *
      * @return int|null
-     *
      * @throws Doctrine_Record_State_Exception if trying to set an unknown state
      */
     public function state($state = null)
@@ -999,11 +986,9 @@ public function state($state = null)
      * refresh
      * refresh internal data from the database.
      *
-     * @param bool $deep If true, fetch also current relations. Caution: this deletes
-     *                   any aggregated values you may have queried beforee
-     *
-     * @return false|Doctrine_Record false if the record is not saved yet
-     *
+     * @param  bool                      $deep If true, fetch also current relations. Caution: this deletes
+     *                                         any aggregated values you may have queried beforee
+     * @return false|Doctrine_Record     false if the record is not saved yet
      * @throws Doctrine_Record_Exception When the refresh operation fails (when the database row
      *                                   this record represents does not exist anymore)
      */
@@ -1111,9 +1096,8 @@ public function clearRelated($name = null)
      * in order to check. If the reference didn't already exist and it doesn't
      * exist in the database, the related reference will be cleared immediately.
      *
-     * @param string $name
-     *
-     * @return bool Whether or not the related relationship exists
+     * @param  string $name
+     * @return bool   Whether or not the related relationship exists
      */
     public function relatedExists($name)
     {
@@ -1179,8 +1163,7 @@ public function rawGet($fieldName)
      * loads all the uninitialized properties from the database.
      * Used to move a record from PROXY to CLEAN/DIRTY state.
      *
-     * @param array $data overwriting data to load in the record. Instance is hydrated from the table if not specified.
-     *
+     * @param  array $data overwriting data to load in the record. Instance is hydrated from the table if not specified.
      * @return bool
      */
     public function load(array $data = array())
@@ -1244,9 +1227,8 @@ public function isInProxyState()
      * sets a fieldname to have a custom accessor or check if a field has a custom
      * accessor defined (when called without $accessor parameter).
      *
-     * @param string $fieldName
-     * @param string $accessor
-     *
+     * @param  string $fieldName
+     * @param  string $accessor
      * @return bool
      */
     public function hasAccessor($fieldName, $accessor = null)
@@ -1273,8 +1255,7 @@ public function clearAccessor($fieldName)
     /**
      * gets the custom accessor for a field name.
      *
-     * @param string $fieldName
-     *
+     * @param  string $fieldName
      * @return string $accessor
      */
     public function getAccessor($fieldName)
@@ -1302,9 +1283,8 @@ public function getAccessors()
      * sets a fieldname to have a custom mutator or check if a field has a custom
      * mutator defined (when called without the $mutator parameter).
      *
-     * @param string $fieldName
-     * @param string $mutator
-     *
+     * @param  string $fieldName
+     * @param  string $mutator
      * @return bool
      */
     public function hasMutator($fieldName, $mutator = null)
@@ -1369,9 +1349,8 @@ public function hasAccessorMutator($fieldName, $accessor, $mutator)
     /**
      * returns a value of a property or a related component.
      *
-     * @param mixed $fieldName name of the property or related component
-     * @param bool  $load      whether or not to invoke the loading procedure
-     *
+     * @param  mixed                     $fieldName name of the property or related component
+     * @param  bool                      $load      whether or not to invoke the loading procedure
      * @throws Doctrine_Record_Exception if trying to get a value of unknown property / related component
      */
     public function get($fieldName, $load = true)
@@ -1462,8 +1441,7 @@ public function mapValue($name, $value = null)
     /**
      * Tests whether a mapped value exists.
      *
-     * @param string $name the name of the property
-     *
+     * @param  string $name the name of the property
      * @return bool
      */
     public function hasMappedValue($name)
@@ -1474,11 +1452,9 @@ public function hasMappedValue($name)
     /**
      * alters mapped values, properties and related components.
      *
-     * @param mixed $value value of the property or reference
-     * @param bool  $load  whether or not to refresh / load the uninitialized record data
-     *
+     * @param  mixed                     $value value of the property or reference
+     * @param  bool                      $load  whether or not to refresh / load the uninitialized record data
      * @return Doctrine_Record
-     *
      * @throws Doctrine_Record_Exception if trying to set a value for unknown property / related component
      * @throws Doctrine_Record_Exception if trying to set a value of wrong type for related component
      */
@@ -1570,11 +1546,10 @@ protected function _set($fieldName, $value, $load = true)
      * Simply doing $old !== $new will return false for boolean columns would mark the field as modified
      * and change it in the database when it is not necessary
      *
-     * @param string $type Doctrine type of the column
-     * @param string $old  Old value
-     * @param string $new  New value
-     *
-     * @return bool $modified  Whether or not Doctrine considers the value modified
+     * @param  string $type Doctrine type of the column
+     * @param  string $old  Old value
+     * @param  string $new  New value
+     * @return bool   $modified  Whether or not Doctrine considers the value modified
      */
     protected function _isValueModified($type, $old, $new)
     {
@@ -1674,8 +1649,7 @@ public function coreSetRelated($name, $value)
     /**
      * test whether a field (column, mapped value, related component, accessor) is accessible by @see get().
      *
-     * @param string $fieldName
-     *
+     * @param  string $fieldName
      * @return bool
      */
     public function contains($fieldName)
@@ -1754,9 +1728,8 @@ public function resetPendingUnlinks()
      *
      * this method also saves the related components
      *
-     * @param Doctrine_Connection $conn optional connection parameter
-     *
-     * @throws Exception if record is not valid and validation is active
+     * @param  Doctrine_Connection $conn optional connection parameter
+     * @throws Exception           if record is not valid and validation is active
      */
     public function save(Doctrine_Connection $conn = null)
     {
@@ -1772,9 +1745,8 @@ public function save(Doctrine_Connection $conn = null)
      * throw an exception when validation fails but returns TRUE on
      * success or FALSE on failure.
      *
-     * @param Doctrine_Connection $conn optional connection parameter
-     *
-     * @return true if the record was saved sucessfully without errors, FALSE otherwise
+     * @param  Doctrine_Connection $conn optional connection parameter
+     * @return true                if the record was saved sucessfully without errors, FALSE otherwise
      */
     public function trySave(Doctrine_Connection $conn = null)
     {
@@ -1798,10 +1770,8 @@ public function trySave(Doctrine_Connection $conn = null)
      * query isemulated through this method for other DBMS using standard types
      * of queries inside a transaction to assure the atomicity of the operation.
      *
-     * @param Doctrine_Connection $conn optional connection parameter
-     *
-     * @return int number of rows affected
-     *
+     * @param  Doctrine_Connection           $conn optional connection parameter
+     * @return int                           number of rows affected
      * @throws Doctrine_Connection_Exception if some of the key values was null
      * @throws Doctrine_Connection_Exception if there were no key fields
      * @throws Doctrine_Connection_Exception if something fails at database level
@@ -1818,9 +1788,8 @@ public function replace(Doctrine_Connection $conn = null)
     /**
      * retrieves an array of modified fields and associated new values.
      *
-     * @param bool $old  pick the old values (instead of the new ones)
-     * @param bool $last pick only lastModified values (@see getLastModified())
-     *
+     * @param  bool  $old  pick the old values (instead of the new ones)
+     * @param  bool  $last pick only lastModified values (@see getLastModified())
      * @return array $a
      */
     public function getModified($old = false, $last = false)
@@ -1844,8 +1813,7 @@ public function getModified($old = false, $last = false)
     /**
      * returns an array of the modified fields from the last transaction.
      *
-     * @param bool $old pick the old values (instead of the new ones)
-     *
+     * @param  bool  $old pick the old values (instead of the new ones)
      * @return array
      */
     public function getLastModified($old = false)
@@ -1944,9 +1912,8 @@ public function columnCount()
      *
      * @see http://www.doctrine-project.org/documentation/manual/1_1/en/working-with-models
      *
-     * @param bool $deep      whether to include relations
-     * @param bool $prefixKey not used
-     *
+     * @param  bool  $deep      whether to include relations
+     * @param  bool  $prefixKey not used
      * @return array
      */
     public function toArray($deep = true, $prefixKey = false)
@@ -2128,9 +2095,8 @@ public function synchronizeWithArray(array $array, $deep = true)
     /**
      * exports instance to a chosen format.
      *
-     * @param string $type format type: array, xml, yml, json
-     * @param string $deep whether or not to export all relationships
-     *
+     * @param  string $type format type: array, xml, yml, json
+     * @param  string $deep whether or not to export all relationships
      * @return string representation as $type format. Array is $type is array
      */
     public function exportTo($type, $deep = true)
@@ -2173,8 +2139,7 @@ public function exists()
     /**
      * returns true if this record was modified, otherwise false.
      *
-     * @param bool $deep whether to process also the relations for changes
-     *
+     * @param  bool $deep whether to process also the relations for changes
      * @return bool
      */
     public function isModified($deep = false)
@@ -2211,8 +2176,7 @@ public function isModified($deep = false)
     /**
      * checks existence of properties and related components.
      *
-     * @param mixed $fieldName name of the property or reference
-     *
+     * @param  mixed $fieldName name of the property or reference
      * @return bool
      */
     public function hasRelation($fieldName)
@@ -2255,8 +2219,7 @@ public function delete(Doctrine_Connection $conn = null)
     /**
      * generates a copy of this object. Returns an instance of the same class of $this.
      *
-     * @param bool $deep whether to duplicates the objects targeted by the relations
-     *
+     * @param  bool            $deep whether to duplicates the objects targeted by the relations
      * @return Doctrine_Record
      */
     public function copy($deep = false)
@@ -2368,8 +2331,7 @@ public function getLast()
     /**
      * tests whether a relation is set.
      *
-     * @param string $name relation alias
-     *
+     * @param  string $name relation alias
      * @return bool
      */
     public function hasReference($name)
@@ -2380,8 +2342,7 @@ public function hasReference($name)
     /**
      * gets a related component.
      *
-     * @param string $name
-     *
+     * @param  string                              $name
      * @return Doctrine_Record|Doctrine_Collection
      */
     public function reference($name)
@@ -2394,8 +2355,7 @@ public function reference($name)
     /**
      * gets a related component and fails if it does not exist.
      *
-     * @param string $name
-     *
+     * @param  string                    $name
      * @throws Doctrine_Record_Exception if trying to get an unknown related component
      */
     public function obtainReference($name)
@@ -2430,8 +2390,7 @@ final public function setRelated($alias, Doctrine_Access $coll)
      * loadReference
      * loads a related component.
      *
-     * @param string $name alias of the relation
-     *
+     * @param  string                   $name alias of the relation
      * @throws Doctrine_Table_Exception if trying to load an unknown related component
      */
     public function loadReference($name)
@@ -2446,7 +2405,6 @@ public function loadReference($name)
      * @param string|array $callback valid callback
      * @param string       $column   column name
      * @param mixed arg1 ... argN       optional callback arguments
-     *
      * @return Doctrine_Record provides a fluent interface
      */
     public function call($callback, $column)
@@ -2498,10 +2456,9 @@ public function unshiftFilter(Doctrine_Record_Filter $filter)
      * removes links from this record to given records
      * if no ids are given, it removes all links.
      *
-     * @param string $alias related component alias
-     * @param array  $ids   the identifiers of the related records
-     * @param bool   $now   whether or not to execute now or set as pending unlinks
-     *
+     * @param  string          $alias related component alias
+     * @param  array           $ids   the identifiers of the related records
+     * @param  bool            $now   whether or not to execute now or set as pending unlinks
      * @return Doctrine_Record this object (fluent interface)
      */
     public function unlink($alias, $ids = array(), $now = false)
@@ -2547,9 +2504,8 @@ public function unlink($alias, $ids = array(), $now = false)
     /**
      * unlink now the related components, querying the db.
      *
-     * @param string $alias related component alias
-     * @param array  $ids   the identifiers of the related records
-     *
+     * @param  string          $alias related component alias
+     * @param  array           $ids   the identifiers of the related records
      * @return Doctrine_Record this object (fluent interface)
      */
     public function unlinkInDb($alias, $ids = array())
@@ -2588,10 +2544,9 @@ public function unlinkInDb($alias, $ids = array())
     /**
      * creates links from this record to given records.
      *
-     * @param string $alias related component alias
-     * @param array  $ids   the identifiers of the related records
-     * @param bool   $now   wether or not to execute now or set pending
-     *
+     * @param  string          $alias related component alias
+     * @param  array           $ids   the identifiers of the related records
+     * @param  bool            $now   wether or not to execute now or set pending
      * @return Doctrine_Record this object (fluent interface)
      */
     public function link($alias, $ids, $now = false)
@@ -2636,9 +2591,8 @@ public function link($alias, $ids, $now = false)
     /**
      * creates links from this record to given records now, querying the db.
      *
-     * @param string $alias related component alias
-     * @param array  $ids   the identifiers of the related records
-     *
+     * @param  string          $alias related component alias
+     * @param  array           $ids   the identifiers of the related records
      * @return Doctrine_Record this object (fluent interface)
      */
     public function linkInDb($alias, $ids)
@@ -2723,10 +2677,9 @@ protected function _resetModified()
      *
      * So, in sense, this method replicates the usage of mixins (as seen in some programming languages)
      *
-     * @param string $method name of the method
-     * @param array  $args   method arguments
-     *
-     * @return mixed the return value of the given method
+     * @param  string $method name of the method
+     * @param  array  $args   method arguments
+     * @return mixed  the return value of the given method
      */
     public function __call($method, $args)
     {
diff --git a/lib/Doctrine/Record/Abstract.php b/lib/Doctrine/Record/Abstract.php
index 317076826..4946f239d 100644
--- a/lib/Doctrine/Record/Abstract.php
+++ b/lib/Doctrine/Record/Abstract.php
@@ -23,12 +23,8 @@
  * Doctrine_Record_Abstract.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  */
 abstract class Doctrine_Record_Abstract extends Doctrine_Access
 {
@@ -59,9 +55,8 @@ public function getTable()
     /**
      * addListener.
      *
-     * @param Doctrine_EventListener_Interface|Doctrine_Overloadable|Doctrine_Record_Listener_Interface $listener
-     * @param mixed|null                                                                                $name
-     *
+     * @param  Doctrine_EventListener_Interface|Doctrine_Overloadable|Doctrine_Record_Listener_Interface $listener
+     * @param  mixed|null                                                                                $name
      * @return Doctrine_Record
      */
     public function addListener($listener, $name = null)
@@ -84,8 +79,7 @@ public function getListener()
     /**
      * setListener.
      *
-     * @param Doctrine_EventListener_Interface|Doctrine_Overloadable|Doctrine_Record_Listener_Interface $listener
-     *
+     * @param  Doctrine_EventListener_Interface|Doctrine_Overloadable|Doctrine_Record_Listener_Interface $listener
      * @return Doctrine_Record
      */
     public function setListener($listener)
@@ -300,8 +294,7 @@ public function setColumnOption($columnName, $option, $value)
      * bindQueryParts
      * binds query parts to given component.
      *
-     * @param array $queryParts an array of pre-bound query parts
-     *
+     * @param  array           $queryParts an array of pre-bound query parts
      * @return Doctrine_Record this object
      */
     public function bindQueryParts(array $queryParts)
@@ -325,12 +318,10 @@ public function loadGenerator(Doctrine_Record_Generator $generator)
      * also to the record table if it.
      * It is tipically called in @see setUp().
      *
-     * @param mixed $tpl     if an object, must be a subclass of Doctrine_Template.
-     *                       If a string, Doctrine will try to instantiate an object of the classes Doctrine_Template_$tpl and subsequently $tpl, using also autoloading capabilities if defined.
-     * @param array $options argument to pass to the template constructor if $tpl is a class name
-     *
-     * @return Doctrine_Record this object; provides a fluent interface
-     *
+     * @param  mixed                     $tpl     if an object, must be a subclass of Doctrine_Template.
+     *                                            If a string, Doctrine will try to instantiate an object of the classes Doctrine_Template_$tpl and subsequently $tpl, using also autoloading capabilities if defined.
+     * @param  array                     $options argument to pass to the template constructor if $tpl is a class name
+     * @return Doctrine_Record           this object; provides a fluent interface
      * @throws Doctrine_Record_Exception if $tpl is neither an instance of Doctrine_Template subclass or a valid class name, that could be instantiated
      */
     public function actAs($tpl, array $options = array())
@@ -368,9 +359,8 @@ public function actAs($tpl, array $options = array())
      *
      * This method will add a CHECK constraint to the record table.
      *
-     * @param mixed  $constraint either a SQL constraint portion or an array of CHECK constraints. If array, all values will be added as constraint
-     * @param string $name       optional constraint name. Not used if $constraint is an array.
-     *
+     * @param  mixed           $constraint either a SQL constraint portion or an array of CHECK constraints. If array, all values will be added as constraint
+     * @param  string          $name       optional constraint name. Not used if $constraint is an array.
      * @return Doctrine_Record this object
      */
     public function check($constraint, $name = null)
diff --git a/lib/Doctrine/Record/Exception.php b/lib/Doctrine/Record/Exception.php
index 0d66e8f06..a4467a2d7 100644
--- a/lib/Doctrine/Record/Exception.php
+++ b/lib/Doctrine/Record/Exception.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Exception.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7490 $
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
diff --git a/lib/Doctrine/Record/Filter.php b/lib/Doctrine/Record/Filter.php
index 8cb824920..f064e535b 100644
--- a/lib/Doctrine/Record/Filter.php
+++ b/lib/Doctrine/Record/Filter.php
@@ -24,12 +24,8 @@
  * Filters the record getters and setters.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 1298 $
  */
 abstract class Doctrine_Record_Filter
 {
@@ -52,8 +48,7 @@ public function init()
     /**
      * Provides a way for setting property or relation value to the given record.
      *
-     * @param string $propertyOrRelation
-     *
+     * @param  string          $propertyOrRelation
      * @return Doctrine_Record the given record
      *
      * @thrown Doctrine_Exception when this way is not available
diff --git a/lib/Doctrine/Record/Filter/Compound.php b/lib/Doctrine/Record/Filter/Compound.php
index 0a92b1b81..0e7746576 100644
--- a/lib/Doctrine/Record/Filter/Compound.php
+++ b/lib/Doctrine/Record/Filter/Compound.php
@@ -23,12 +23,8 @@
  * Doctrine_Record_Filter_Compound.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 1298 $
  */
 class Doctrine_Record_Filter_Compound extends Doctrine_Record_Filter
 {
@@ -59,8 +55,7 @@ public function init()
     /**
      * Provides a way for setting property or relation value to the given record.
      *
-     * @param string $propertyOrRelation
-     *
+     * @param  string          $propertyOrRelation
      * @return Doctrine_Record the given record
      *
      * @thrown Doctrine_Record_UnknownPropertyException when this way is not available
diff --git a/lib/Doctrine/Record/Filter/Standard.php b/lib/Doctrine/Record/Filter/Standard.php
index 42d0a0033..850b8e8e4 100644
--- a/lib/Doctrine/Record/Filter/Standard.php
+++ b/lib/Doctrine/Record/Filter/Standard.php
@@ -24,12 +24,8 @@
  * Filters the record getters and setters.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 1298 $
  */
 class Doctrine_Record_Filter_Standard extends Doctrine_Record_Filter
 {
diff --git a/lib/Doctrine/Record/Generator.php b/lib/Doctrine/Record/Generator.php
index e2a397a79..29b8252ba 100644
--- a/lib/Doctrine/Record/Generator.php
+++ b/lib/Doctrine/Record/Generator.php
@@ -23,12 +23,8 @@
  * Doctrine_Record_Generator.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
- * @version     $Revision$
  *
  * @see        www.doctrine-project.org
- * @since       1.0
  */
 abstract class Doctrine_Record_Generator extends Doctrine_Record_Abstract
 {
@@ -97,8 +93,7 @@ public function getOption($name)
     /**
      * Sets given value to an option.
      *
-     * @param $value the value of the option
-     *
+     * @param                  $value the value of the option
      * @return Doctrine_Plugin this object
      */
     public function setOption($name, $value)
@@ -264,9 +259,8 @@ public function buildChildDefinitions()
      * These columns are automatically added to the generated model so we can
      * create foreign keys back to the table object that owns the plugin.
      *
-     * @param Doctrine_Table $table the table object that owns the plugin
-     *
-     * @return array an array of foreign key definitions
+     * @param  Doctrine_Table $table the table object that owns the plugin
+     * @return array          an array of foreign key definitions
      */
     public function buildForeignKeys(Doctrine_Table $table)
     {
diff --git a/lib/Doctrine/Record/Iterator.php b/lib/Doctrine/Record/Iterator.php
index a8ba4a863..7cf134931 100644
--- a/lib/Doctrine/Record/Iterator.php
+++ b/lib/Doctrine/Record/Iterator.php
@@ -23,12 +23,8 @@
  * Doctrine_Record_Iterator.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7490 $
  */
 class Doctrine_Record_Iterator extends ArrayIterator
 {
diff --git a/lib/Doctrine/Record/Listener.php b/lib/Doctrine/Record/Listener.php
index 355465f47..c924c9b0b 100644
--- a/lib/Doctrine/Record/Listener.php
+++ b/lib/Doctrine/Record/Listener.php
@@ -23,12 +23,8 @@
  * Doctrine_Record_Listener.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  */
 class Doctrine_Record_Listener implements Doctrine_Record_Listener_Interface
 {
@@ -68,9 +64,8 @@ public function getOptions()
      * getOption
      * returns the value of given option.
      *
-     * @param string $name the name of the option
-     *
-     * @return mixed the value of given option
+     * @param  string $name the name of the option
+     * @return mixed  the value of given option
      */
     public function getOption($name)
     {
diff --git a/lib/Doctrine/Record/Listener/Chain.php b/lib/Doctrine/Record/Listener/Chain.php
index e7932b7cb..55f558fde 100644
--- a/lib/Doctrine/Record/Listener/Chain.php
+++ b/lib/Doctrine/Record/Listener/Chain.php
@@ -25,12 +25,8 @@
  * useful for having multiple listeners listening the events at the same time.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  */
 class Doctrine_Record_Listener_Chain extends Doctrine_Access implements Doctrine_Record_Listener_Interface
 {
@@ -64,9 +60,8 @@ public function setOption($name, $value = null)
      * getOption
      * returns the value of given option.
      *
-     * @param string $name the name of the option
-     *
-     * @return mixed the value of given option
+     * @param  string $name the name of the option
+     * @return mixed  the value of given option
      */
     public function getOption($name)
     {
@@ -123,8 +118,7 @@ public function get($key)
     /**
      * set.
      *
-     * @param Doctrine_Record_Listener $listener listener to be added
-     *
+     * @param  Doctrine_Record_Listener       $listener listener to be added
      * @return Doctrine_Record_Listener_Chain this object
      */
     public function set($key, $listener)
diff --git a/lib/Doctrine/Record/Listener/Interface.php b/lib/Doctrine/Record/Listener/Interface.php
index c32b52138..59e12385a 100644
--- a/lib/Doctrine/Record/Listener/Interface.php
+++ b/lib/Doctrine/Record/Listener/Interface.php
@@ -23,12 +23,8 @@
  * Doctrine_Record_Listener.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  */
 interface Doctrine_Record_Listener_Interface
 {
diff --git a/lib/Doctrine/Record/State/Exception.php b/lib/Doctrine/Record/State/Exception.php
index 0c5d320c2..5b0c6d581 100644
--- a/lib/Doctrine/Record/State/Exception.php
+++ b/lib/Doctrine/Record/State/Exception.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Exception.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7490 $
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
diff --git a/lib/Doctrine/Record/UnknownPropertyException.php b/lib/Doctrine/Record/UnknownPropertyException.php
index 9461e1d4c..c50e0e9ad 100644
--- a/lib/Doctrine/Record/UnknownPropertyException.php
+++ b/lib/Doctrine/Record/UnknownPropertyException.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Record_UnknownPropertyException.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 4252 $
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
diff --git a/lib/Doctrine/Relation.php b/lib/Doctrine/Relation.php
index 2818e0167..74eda6606 100644
--- a/lib/Doctrine/Relation.php
+++ b/lib/Doctrine/Relation.php
@@ -23,12 +23,7 @@
  * Doctrine_Relation
  * This class represents a relation between components.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7490 $
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
@@ -350,8 +345,7 @@ final public function isOneToOne()
     /**
      * getRelationDql.
      *
-     * @param int $count
-     *
+     * @param  int    $count
      * @return string
      */
     public function getRelationDql($count)
@@ -390,9 +384,8 @@ public function getForeignKeyName()
     /**
      * Get the relationship orderby SQL/DQL.
      *
-     * @param string $alias       The alias to use
-     * @param bool   $columnNames Whether or not to use column names instead of field names
-     *
+     * @param  string $alias       The alias to use
+     * @param  bool   $columnNames Whether or not to use column names instead of field names
      * @return string $orderBy
      */
     public function getOrderBy($alias = null, $columnNames = false)
@@ -409,9 +402,8 @@ public function getOrderBy($alias = null, $columnNames = false)
     /**
      * Get the relationship orderby statement.
      *
-     * @param string $alias       The alias to use
-     * @param bool   $columnNames Whether or not to use column names instead of field names
-     *
+     * @param  string $alias       The alias to use
+     * @param  bool   $columnNames Whether or not to use column names instead of field names
      * @return string $orderByStatement
      */
     public function getOrderByStatement($alias = null, $columnNames = false)
diff --git a/lib/Doctrine/Relation/Association.php b/lib/Doctrine/Relation/Association.php
index 35543c312..9b37647d6 100644
--- a/lib/Doctrine/Relation/Association.php
+++ b/lib/Doctrine/Relation/Association.php
@@ -24,12 +24,7 @@
  *                         (= many-to-many relationships, where the relationship is handled with an additional relational table
  *                         which holds 2 foreign keys).
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7490 $
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
@@ -51,8 +46,7 @@ public function getAssociationTable()
     /**
      * getRelationDql.
      *
-     * @param int $count
-     *
+     * @param  int    $count
      * @return string
      */
     public function getRelationDql($count, $context = 'record')
diff --git a/lib/Doctrine/Relation/Association/Self.php b/lib/Doctrine/Relation/Association/Self.php
index 9195ed97a..0a572ee4b 100644
--- a/lib/Doctrine/Relation/Association/Self.php
+++ b/lib/Doctrine/Relation/Association/Self.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Relation_Association_Self.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7490 $
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
@@ -36,8 +31,7 @@ class Doctrine_Relation_Association_Self extends Doctrine_Relation_Association
     /**
      * getRelationDql.
      *
-     * @param int $count
-     *
+     * @param  int    $count
      * @return string
      */
     public function getRelationDql($count, $context = 'record')
diff --git a/lib/Doctrine/Relation/Exception.php b/lib/Doctrine/Relation/Exception.php
index 53e96f3cd..c34174d1b 100644
--- a/lib/Doctrine/Relation/Exception.php
+++ b/lib/Doctrine/Relation/Exception.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Relation_Exception.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 1344 $
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
diff --git a/lib/Doctrine/Relation/ForeignKey.php b/lib/Doctrine/Relation/ForeignKey.php
index 579bfd4b3..2bd25c325 100644
--- a/lib/Doctrine/Relation/ForeignKey.php
+++ b/lib/Doctrine/Relation/ForeignKey.php
@@ -24,12 +24,8 @@
  * This class represents a foreign key relation.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7490 $
  */
 class Doctrine_Relation_ForeignKey extends Doctrine_Relation
 {
diff --git a/lib/Doctrine/Relation/LocalKey.php b/lib/Doctrine/Relation/LocalKey.php
index 4910b6f1f..aa42f2766 100644
--- a/lib/Doctrine/Relation/LocalKey.php
+++ b/lib/Doctrine/Relation/LocalKey.php
@@ -24,12 +24,8 @@
  * This class represents a local key relation.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7490 $
  */
 class Doctrine_Relation_LocalKey extends Doctrine_Relation
 {
diff --git a/lib/Doctrine/Relation/Nest.php b/lib/Doctrine/Relation/Nest.php
index cbedd7b04..4eeb596a3 100644
--- a/lib/Doctrine/Relation/Nest.php
+++ b/lib/Doctrine/Relation/Nest.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Relation_Association_Self.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 1434 $
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
diff --git a/lib/Doctrine/Relation/Parser.php b/lib/Doctrine/Relation/Parser.php
index d37a2cdd4..d9f09e9f9 100644
--- a/lib/Doctrine/Relation/Parser.php
+++ b/lib/Doctrine/Relation/Parser.php
@@ -23,12 +23,8 @@
  * Doctrine_Relation_Parser.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
- * @version     $Revision$
  *
  * @see        www.doctrine-project.org
- * @since       1.0
  *
  * @todo Composite key support?
  */
@@ -107,9 +103,8 @@ public function unsetPendingRelations($name)
     /**
      * Check if a relation alias exists.
      *
-     * @param string $name
-     *
-     * @return bool $bool
+     * @param  string $name
+     * @return bool   $bool
      */
     public function hasRelation($name)
     {
@@ -283,8 +278,7 @@ public function getImpl($template)
     /**
      * Completes the given association definition.
      *
-     * @param array $def definition array to be completed
-     *
+     * @param  array $def definition array to be completed
      * @return array completed definition array
      */
     public function completeAssocDefinition($def)
@@ -359,10 +353,9 @@ public function getIdentifiers(Doctrine_Table $table)
     /**
      * guessColumns.
      *
-     * @param array          $classes      an array of class names
-     * @param Doctrine_Table $foreignTable foreign table object
-     *
-     * @return array an array of column names
+     * @param  array          $classes      an array of class names
+     * @param  Doctrine_Table $foreignTable foreign table object
+     * @return array          an array of column names
      */
     public function guessColumns(array $classes, Doctrine_Table $foreignTable)
     {
@@ -398,8 +391,7 @@ public function guessColumns(array $classes, Doctrine_Table $foreignTable)
     /**
      * Completes the given definition.
      *
-     * @param array $def definition array to be completed
-     *
+     * @param  array $def definition array to be completed
      * @return array completed definition array
      *
      * @todo Description: What does it mean to complete a definition? What is done (not how)?
diff --git a/lib/Doctrine/Relation/Parser/Exception.php b/lib/Doctrine/Relation/Parser/Exception.php
index 77a813983..140877011 100644
--- a/lib/Doctrine/Relation/Parser/Exception.php
+++ b/lib/Doctrine/Relation/Parser/Exception.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Relation_Parser_Exception.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
diff --git a/lib/Doctrine/Search.php b/lib/Doctrine/Search.php
index 3104f1c3e..0b522e3bc 100644
--- a/lib/Doctrine/Search.php
+++ b/lib/Doctrine/Search.php
@@ -23,12 +23,8 @@
  * Doctrine_Search.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
- * @version     $Revision$
  *
  * @see        www.doctrine-project.org
- * @since       1.0
  */
 class Doctrine_Search extends Doctrine_Record_Generator
 {
@@ -85,10 +81,9 @@ public function buildTable()
     /**
      * Searchable keyword search.
      *
-     * @param string         $string Keyword string to search for
-     * @param Doctrine_Query $query  Query object to alter. Adds where condition to limit the results using the search index
-     *
-     * @return array ids and relevancy
+     * @param  string         $string Keyword string to search for
+     * @param  Doctrine_Query $query  Query object to alter. Adds where condition to limit the results using the search index
+     * @return array          ids and relevancy
      */
     public function search($string, $query = null)
     {
@@ -127,8 +122,7 @@ public function analyze($text, $encoding = null)
      * updateIndex
      * updates the index.
      *
-     * @param mixed|null $encoding
-     *
+     * @param  mixed|null $encoding
      * @return int
      */
     public function updateIndex(array $data, $encoding = null)
@@ -184,9 +178,8 @@ public function updateIndex(array $data, $encoding = null)
     /**
      * readTableData.
      *
-     * @param mixed|null $limit
-     * @param mixed|null $offset
-     *
+     * @param  mixed|null          $limit
+     * @param  mixed|null          $offset
      * @return Doctrine_Collection The collection of results
      */
     public function readTableData($limit = null, $offset = null)
diff --git a/lib/Doctrine/Search/Analyzer.php b/lib/Doctrine/Search/Analyzer.php
index cbb7ef0e8..deb19f12b 100644
--- a/lib/Doctrine/Search/Analyzer.php
+++ b/lib/Doctrine/Search/Analyzer.php
@@ -23,12 +23,8 @@
  * Doctrine_Search_Analyzer.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
- * @version     $Revision$
  *
  * @see        www.doctrine-project.org
- * @since       1.0
  */
 class Doctrine_Search_Analyzer implements Doctrine_Search_Analyzer_Interface
 {
diff --git a/lib/Doctrine/Search/Analyzer/Exception.php b/lib/Doctrine/Search/Analyzer/Exception.php
index 7052ae3ac..a981582ba 100644
--- a/lib/Doctrine/Search/Analyzer/Exception.php
+++ b/lib/Doctrine/Search/Analyzer/Exception.php
@@ -23,12 +23,8 @@
  * Doctrine_Search_Analyzer_Exception.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
- * @version     $Revision$
  *
  * @see        www.doctrine-project.org
- * @since       1.0
  */
 class Doctrine_Search_Analyzer_Exception extends Doctrine_Search_Exception
 {
diff --git a/lib/Doctrine/Search/Analyzer/Interface.php b/lib/Doctrine/Search/Analyzer/Interface.php
index 41c2cea1c..bf0abf0bc 100644
--- a/lib/Doctrine/Search/Analyzer/Interface.php
+++ b/lib/Doctrine/Search/Analyzer/Interface.php
@@ -23,12 +23,8 @@
  * Doctrine_Search_Analyzer_Interface.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
- * @version     $Revision$
  *
  * @see        www.doctrine-project.org
- * @since       1.0
  */
 interface Doctrine_Search_Analyzer_Interface
 {
diff --git a/lib/Doctrine/Search/Analyzer/Standard.php b/lib/Doctrine/Search/Analyzer/Standard.php
index 890dbd623..1db56f37b 100644
--- a/lib/Doctrine/Search/Analyzer/Standard.php
+++ b/lib/Doctrine/Search/Analyzer/Standard.php
@@ -23,12 +23,8 @@
  * Doctrine_Search_Analyzer_Standard.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
- * @version     $Revision$
  *
  * @see        www.doctrine-project.org
- * @since       1.0
  */
 class Doctrine_Search_Analyzer_Standard extends Doctrine_Search_Analyzer implements Doctrine_Search_Analyzer_Interface
 {
diff --git a/lib/Doctrine/Search/Analyzer/Utf8.php b/lib/Doctrine/Search/Analyzer/Utf8.php
index d6f26634e..d67c2a3e1 100644
--- a/lib/Doctrine/Search/Analyzer/Utf8.php
+++ b/lib/Doctrine/Search/Analyzer/Utf8.php
@@ -26,12 +26,8 @@
  * $encoding encoding, and return an array of words to be indexed.
  *
  * @author      Brice Figureau <brice+doctrine@daysofwonder.com>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
- * @version     $Revision$
  *
  * @see        www.doctrine-project.org
- * @since       1.0
  */
 class Doctrine_Search_Analyzer_Utf8 extends Doctrine_Search_Analyzer_Standard
 {
diff --git a/lib/Doctrine/Search/Exception.php b/lib/Doctrine/Search/Exception.php
index 5ed34ae14..b146a78a0 100644
--- a/lib/Doctrine/Search/Exception.php
+++ b/lib/Doctrine/Search/Exception.php
@@ -23,12 +23,8 @@
  * Doctrine_Search_Exception.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
- * @version     $Revision$
  *
  * @see        www.doctrine-project.org
- * @since       1.0
  */
 class Doctrine_Search_Exception extends Doctrine_Exception
 {
diff --git a/lib/Doctrine/Search/File.php b/lib/Doctrine/Search/File.php
index 7c6a7e3cc..4c53aa91a 100644
--- a/lib/Doctrine/Search/File.php
+++ b/lib/Doctrine/Search/File.php
@@ -23,12 +23,8 @@
  * Doctrine_Search.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
- * @version     $Revision$
  *
  * @see        www.doctrine-project.org
- * @since       1.0
  */
 class Doctrine_Search_File extends Doctrine_Search
 {
diff --git a/lib/Doctrine/Search/Indexer.php b/lib/Doctrine/Search/Indexer.php
index 52d300028..02574b995 100644
--- a/lib/Doctrine/Search/Indexer.php
+++ b/lib/Doctrine/Search/Indexer.php
@@ -23,12 +23,8 @@
  * Doctrine_Search_Indexer.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
- * @version     $Revision$
  *
  * @see        www.doctrine-project.org
- * @since       1.0
  */
 class Doctrine_Search_Indexer
 {
diff --git a/lib/Doctrine/Search/Indexer/Dir.php b/lib/Doctrine/Search/Indexer/Dir.php
index f52755b8e..20b497093 100644
--- a/lib/Doctrine/Search/Indexer/Dir.php
+++ b/lib/Doctrine/Search/Indexer/Dir.php
@@ -23,12 +23,8 @@
  * Doctrine_Search_Indexer_Dir.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
- * @version     $Revision$
  *
  * @see        www.doctrine-project.org
- * @since       1.0
  */
 class Doctrine_Search_Indexer_Dir
 {
diff --git a/lib/Doctrine/Search/Indexer/Exception.php b/lib/Doctrine/Search/Indexer/Exception.php
index 4fb8f4f9c..3ef5098b0 100644
--- a/lib/Doctrine/Search/Indexer/Exception.php
+++ b/lib/Doctrine/Search/Indexer/Exception.php
@@ -23,12 +23,8 @@
  * Doctrine_Search_Indexer.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
- * @version     $Revision$
  *
  * @see        www.doctrine-project.org
- * @since       1.0
  */
 class Doctrine_Search_Indexer_Exception extends Doctrine_Search_Exception
 {
diff --git a/lib/Doctrine/Search/Listener.php b/lib/Doctrine/Search/Listener.php
index e5dfc3c69..e4c045804 100644
--- a/lib/Doctrine/Search/Listener.php
+++ b/lib/Doctrine/Search/Listener.php
@@ -23,12 +23,8 @@
  * Doctrine_Search_Listener.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
- * @version     $Revision$
  *
  * @see        www.doctrine-project.org
- * @since       1.0
  */
 class Doctrine_Search_Listener extends Doctrine_Record_Listener
 {
diff --git a/lib/Doctrine/Search/Parser.php b/lib/Doctrine/Search/Parser.php
index aa7fc9276..db86c20eb 100644
--- a/lib/Doctrine/Search/Parser.php
+++ b/lib/Doctrine/Search/Parser.php
@@ -23,12 +23,8 @@
  * Doctrine_Search_Parser_Standard.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
- * @version     $Revision$
  *
  * @see        www.doctrine-project.org
- * @since       1.0
  */
 class Doctrine_Search_Parser
 {
diff --git a/lib/Doctrine/Search/Query.php b/lib/Doctrine/Search/Query.php
index eef9fbb6e..139dd46c4 100644
--- a/lib/Doctrine/Search/Query.php
+++ b/lib/Doctrine/Search/Query.php
@@ -23,12 +23,8 @@
  * Doctrine_Search_Query.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
- * @version     $Revision$
  *
  * @see        www.doctrine-project.org
- * @since       1.0
  */
 class Doctrine_Search_Query
 {
diff --git a/lib/Doctrine/Search/Record.php b/lib/Doctrine/Search/Record.php
index bf2913a67..5d3e6c1f9 100644
--- a/lib/Doctrine/Search/Record.php
+++ b/lib/Doctrine/Search/Record.php
@@ -23,12 +23,8 @@
  * Doctrine_Search_Record.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
- * @version     $Revision$
  *
  * @see        www.doctrine-project.org
- * @since       1.0
  */
 class Doctrine_Search_Record extends Doctrine_Template
 {
diff --git a/lib/Doctrine/Sequence.php b/lib/Doctrine/Sequence.php
index 0779b4552..dcc1e9f83 100644
--- a/lib/Doctrine/Sequence.php
+++ b/lib/Doctrine/Sequence.php
@@ -24,12 +24,8 @@
  * The base class for sequence handling drivers.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7490 $
  */
 class Doctrine_Sequence extends Doctrine_Connection_Module
 {
@@ -38,9 +34,7 @@ class Doctrine_Sequence extends Doctrine_Connection_Module
      *
      * @param string $seqName name of the sequence
      * @param bool              when true missing sequences are automatic created
-     *
-     * @return int next id in the given sequence
-     *
+     * @return int                         next id in the given sequence
      * @throws Doctrine_Sequence_Exception
      */
     public function nextId($seqName, $ondemand = true)
@@ -65,9 +59,8 @@ public function lastInsertId($table = null, $field = null)
     /**
      * Returns the current id of a sequence.
      *
-     * @param string $seqName name of the sequence
-     *
-     * @return int current id in the given sequence
+     * @param  string $seqName name of the sequence
+     * @return int    current id in the given sequence
      */
     public function currId($seqName)
     {
diff --git a/lib/Doctrine/Sequence/Db2.php b/lib/Doctrine/Sequence/Db2.php
index 877ad5050..c4234fe75 100644
--- a/lib/Doctrine/Sequence/Db2.php
+++ b/lib/Doctrine/Sequence/Db2.php
@@ -23,12 +23,8 @@
  * Doctrine_Sequence_Db2.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7490 $
  */
 class Doctrine_Sequence_Db2 extends Doctrine_Sequence
 {
@@ -37,9 +33,7 @@ class Doctrine_Sequence_Db2 extends Doctrine_Sequence
      *
      * @param string $seqName name of the sequence
      * @param bool              when true missing sequences are automatic created
-     *
-     * @return int next id in the given sequence
-     *
+     * @return int                         next id in the given sequence
      * @throws Doctrine_Sequence_Exception
      */
     public function nextId($seqName, $ondemand = true)
@@ -71,10 +65,8 @@ public function nextId($seqName, $ondemand = true)
      * This is supported only on RDBMS brands that support sequences
      * (e.g. Oracle, PostgreSQL, DB2).  Other RDBMS brands return null.
      *
-     * @param string $sequenceName
-     *
+     * @param  string                         $sequenceName
      * @return int
-     *
      * @throws Doctrine_Adapter_Db2_Exception
      */
     public function currId($sequenceName)
@@ -105,11 +97,9 @@ public function currId($sequenceName)
      * The IDENTITY_VAL_LOCAL() function gives the last generated identity value
      * in the current process, even if it was for a GENERATED column.
      *
-     * @param string $tableName  OPTIONAL
-     * @param string $primaryKey OPTIONAL
-     *
+     * @param  string                         $tableName  OPTIONAL
+     * @param  string                         $primaryKey OPTIONAL
      * @return int
-     *
      * @throws Doctrine_Adapter_Db2_Exception
      */
     public function lastInsertId($tableName = null, $primaryKey = null)
diff --git a/lib/Doctrine/Sequence/Exception.php b/lib/Doctrine/Sequence/Exception.php
index 1e088ebf9..4096d98a7 100644
--- a/lib/Doctrine/Sequence/Exception.php
+++ b/lib/Doctrine/Sequence/Exception.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Sequence_Exception.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7490 $
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
diff --git a/lib/Doctrine/Sequence/Mssql.php b/lib/Doctrine/Sequence/Mssql.php
index 07663b1e7..73a70593b 100644
--- a/lib/Doctrine/Sequence/Mssql.php
+++ b/lib/Doctrine/Sequence/Mssql.php
@@ -23,12 +23,8 @@
  * Doctrine_Sequence_Mssql.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7490 $
  */
 class Doctrine_Sequence_Mssql extends Doctrine_Sequence
 {
@@ -39,7 +35,6 @@ class Doctrine_Sequence_Mssql extends Doctrine_Sequence
      *
      * @param string $seqName name of the sequence
      * @param bool              when true missing sequences are automatic created
-     *
      * @return int next id in the given sequence
      */
     public function nextId($seqName, $onDemand = true)
@@ -100,9 +95,8 @@ public function nextId($seqName, $onDemand = true)
     /**
      * Checks if there's a sequence that exists.
      *
-     * @param string $seqName the sequence name to verify
-     *
-     * @return bool $tableExists The value if the table exists or not
+     * @param  string $seqName the sequence name to verify
+     * @return bool   $tableExists The value if the table exists or not
      */
     public function checkSequence($seqName)
     {
@@ -148,9 +142,8 @@ public function lastInsertId($table = null, $field = null)
     /**
      * Returns the current id of a sequence.
      *
-     * @param string $seqName name of the sequence
-     *
-     * @return int current id in the given sequence
+     * @param  string $seqName name of the sequence
+     * @return int    current id in the given sequence
      */
     public function currId($seqName)
     {
diff --git a/lib/Doctrine/Sequence/Mysql.php b/lib/Doctrine/Sequence/Mysql.php
index 320c50fe9..435b49a88 100644
--- a/lib/Doctrine/Sequence/Mysql.php
+++ b/lib/Doctrine/Sequence/Mysql.php
@@ -23,12 +23,8 @@
  * Doctrine_Sequence_Mysql.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7490 $
  */
 class Doctrine_Sequence_Mysql extends Doctrine_Sequence
 {
@@ -37,7 +33,6 @@ class Doctrine_Sequence_Mysql extends Doctrine_Sequence
      *
      * @param string $seqName name of the sequence
      * @param bool              when true missing sequences are automatic created
-     *
      * @return int next id in the given sequence
      */
     public function nextId($seqName, $onDemand = true)
@@ -81,9 +76,8 @@ public function nextId($seqName, $onDemand = true)
      *
      * @param string  name of the table into which a new row was inserted
      * @param string  name of the field into which a new row was inserted
-     * @param mixed|null $table
-     * @param mixed|null $field
-     *
+     * @param  mixed|null $table
+     * @param  mixed|null $field
      * @return int|bool
      */
     public function lastInsertId($table = null, $field = null)
@@ -94,9 +88,8 @@ public function lastInsertId($table = null, $field = null)
     /**
      * Returns the current id of a sequence.
      *
-     * @param string $seqName name of the sequence
-     *
-     * @return int current id in the given sequence
+     * @param  string $seqName name of the sequence
+     * @return int    current id in the given sequence
      */
     public function currId($seqName)
     {
diff --git a/lib/Doctrine/Sequence/Oracle.php b/lib/Doctrine/Sequence/Oracle.php
index 76b571dec..f33595f0d 100644
--- a/lib/Doctrine/Sequence/Oracle.php
+++ b/lib/Doctrine/Sequence/Oracle.php
@@ -23,12 +23,8 @@
  * Doctrine_Sequence_Oracle.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7490 $
  */
 class Doctrine_Sequence_Oracle extends Doctrine_Sequence
 {
@@ -37,7 +33,6 @@ class Doctrine_Sequence_Oracle extends Doctrine_Sequence
      *
      * @param string $seqName name of the sequence
      * @param bool onDemand     when true missing sequences are automatic created
-     *
      * @return int next id in the given sequence
      */
     public function nextID($seqName, $onDemand = true)
@@ -83,9 +78,8 @@ public function lastInsertID($table = null, $field = null)
     /**
      * Returns the current id of a sequence.
      *
-     * @param string $seqName name of the sequence
-     *
-     * @return int current id in the given sequence
+     * @param  string $seqName name of the sequence
+     * @return int    current id in the given sequence
      */
     public function currId($seqName)
     {
diff --git a/lib/Doctrine/Sequence/Pgsql.php b/lib/Doctrine/Sequence/Pgsql.php
index ffd932c84..9db7c736a 100644
--- a/lib/Doctrine/Sequence/Pgsql.php
+++ b/lib/Doctrine/Sequence/Pgsql.php
@@ -23,12 +23,8 @@
  * Doctrine_Sequence_Pgsql.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7490 $
  */
 class Doctrine_Sequence_Pgsql extends Doctrine_Sequence
 {
@@ -37,7 +33,6 @@ class Doctrine_Sequence_Pgsql extends Doctrine_Sequence
      *
      * @param string $seqName name of the sequence
      * @param bool onDemand     when true missing sequences are automatic created
-     *
      * @return int next id in the given sequence
      */
     public function nextId($seqName, $onDemand = true)
@@ -71,10 +66,9 @@ public function nextId($seqName, $onDemand = true)
      *
      * @param   string  name of the table into which a new row was inserted
      * @param   string  name of the field into which a new row was inserted
-     * @param mixed|null $table
-     * @param mixed|null $field
-     *
-     * @return int the autoincremented id
+     * @param  mixed|null $table
+     * @param  mixed|null $field
+     * @return int        the autoincremented id
      */
     public function lastInsertId($table = null, $field = null)
     {
@@ -87,9 +81,8 @@ public function lastInsertId($table = null, $field = null)
     /**
      * Returns the current id of a sequence.
      *
-     * @param string $seqName name of the sequence
-     *
-     * @return int current id in the given sequence
+     * @param  string $seqName name of the sequence
+     * @return int    current id in the given sequence
      */
     public function currId($seqName)
     {
diff --git a/lib/Doctrine/Sequence/Sqlite.php b/lib/Doctrine/Sequence/Sqlite.php
index 8800d37b9..3da560fc6 100644
--- a/lib/Doctrine/Sequence/Sqlite.php
+++ b/lib/Doctrine/Sequence/Sqlite.php
@@ -23,22 +23,17 @@
  * Doctrine_Sequence_Sqlite.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7490 $
  */
 class Doctrine_Sequence_Sqlite extends Doctrine_Sequence
 {
     /**
      * Returns the next free id of a sequence.
      *
-     * @param string $seqName  name of the sequence
-     * @param bool   $onDemand when true missing sequences are automatic created
-     *
-     * @return int next id in the given sequence
+     * @param  string $seqName  name of the sequence
+     * @param  bool   $onDemand when true missing sequences are automatic created
+     * @return int    next id in the given sequence
      */
     public function nextId($seqName, $onDemand = true)
     {
@@ -81,9 +76,8 @@ public function nextId($seqName, $onDemand = true)
      *
      * @param   string  name of the table into which a new row was inserted
      * @param   string  name of the field into which a new row was inserted
-     * @param mixed|null $table
-     * @param mixed|null $field
-     *
+     * @param  mixed|null $table
+     * @param  mixed|null $field
      * @return int|bool
      */
     public function lastInsertId($table = null, $field = null)
@@ -94,9 +88,8 @@ public function lastInsertId($table = null, $field = null)
     /**
      * Returns the current id of a sequence.
      *
-     * @param string $seqName name of the sequence
-     *
-     * @return int current id in the given sequence
+     * @param  string $seqName name of the sequence
+     * @return int    current id in the given sequence
      */
     public function currId($seqName)
     {
diff --git a/lib/Doctrine/Table.php b/lib/Doctrine/Table.php
index 1d55f630f..234843abf 100644
--- a/lib/Doctrine/Table.php
+++ b/lib/Doctrine/Table.php
@@ -24,12 +24,8 @@
  *                  each Doctrine_Table holds the information of foreignKeys and associations.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
- * @version     $Revision$
  *
  * @see        www.doctrine-project.org
- * @since       1.0
  */
 class Doctrine_Table extends Doctrine_Configurable implements Countable, Serializable
 {
@@ -236,10 +232,9 @@ class Doctrine_Table extends Doctrine_Configurable implements Countable, Seriali
     /**
      * the constructor.
      *
-     * @param string              $name           the name of the component
-     * @param Doctrine_Connection $conn           the connection associated with this table
-     * @param bool                $initDefinition whether to init the in-memory schema
-     *
+     * @param  string                        $name           the name of the component
+     * @param  Doctrine_Connection           $conn           the connection associated with this table
+     * @param  bool                          $initDefinition whether to init the in-memory schema
      * @throws Doctrine_Connection_Exception if there are no opened connections
      */
     public function __construct($name, Doctrine_Connection $conn, $initDefinition = false)
@@ -526,8 +521,7 @@ public function initIdentifier()
      * The owner of a column is the name of the component in a hierarchy that
      * defines the column.
      *
-     * @param string $columnName the column name
-     *
+     * @param  string $columnName the column name
      * @return string the name of the owning/defining component
      */
     public function getColumnOwner($columnName)
@@ -561,9 +555,8 @@ public function getRecordInstance()
     /**
      * Checks whether a column is inherited from a component further up in the hierarchy.
      *
-     * @param string $columnName The column name
-     *
-     * @return bool TRUE if column is inherited, FALSE otherwise
+     * @param  string $columnName The column name
+     * @return bool   TRUE if column is inherited, FALSE otherwise
      */
     public function isInheritedColumn($columnName)
     {
@@ -576,9 +569,8 @@ public function isInheritedColumn($columnName)
      * Checks if $fieldName is part of the table identifier, which defines
      * the one-column or multi-column primary key.
      *
-     * @param string $fieldName The field name
-     *
-     * @return bool TRUE if the field is part of the table identifier/primary key field(s),
+     * @param  string $fieldName The field name
+     * @return bool   TRUE if the field is part of the table identifier/primary key field(s),
      */
     public function isIdentifier($fieldName)
     {
@@ -639,9 +631,8 @@ public function setMethodOwner($method, $class)
      * This method create a physical table in the database, using the
      * definition that comes from the component Doctrine_Record instance.
      *
-     * @return bool whether or not the export operation was successful
-     *              false if table already existed in the database
-     *
+     * @return bool                          whether or not the export operation was successful
+     *                                       false if table already existed in the database
      * @throws Doctrine_Connection_Exception if some error other than Doctrine_Core::ERR_ALREADY_EXISTS
      *                                       occurred during the create table operation
      */
@@ -657,8 +648,7 @@ public function export()
      * keys are tableName, columns (@see $_columns) and options.
      * The options subarray contains 'primary' and 'foreignKeys'.
      *
-     * @param bool $parseForeignKeys whether to include foreign keys definition in the options
-     *
+     * @param  bool  $parseForeignKeys whether to include foreign keys definition in the options
      * @return array
      */
     public function getExportableFormat($parseForeignKeys = true)
@@ -745,10 +735,9 @@ public function getExportableFormat($parseForeignKeys = true)
      * Check if a foreign definition already exists in the fks array for a
      * foreign table, local and foreign key.
      *
-     * @param array $def         Foreign key definition to check for
-     * @param array $foreignKeys Array of existing foreign key definitions to check in
-     *
-     * @return bool $result     Whether or not the foreign key was found
+     * @param  array $def         Foreign key definition to check for
+     * @param  array $foreignKeys Array of existing foreign key definitions to check in
+     * @return bool  $result     Whether or not the foreign key was found
      */
     protected function _checkForeignKeyExists($def, $foreignKeys)
     {
@@ -901,8 +890,7 @@ public function addIndex($index, array $definition)
      *
      * This method returns a given index definition: @see addIndex().
      *
-     * @param string $index index name; @see addIndex()
-     *
+     * @param  string     $index index name; @see addIndex()
      * @return array|bool array on success, FALSE on failure
      */
     public function getIndex($index)
@@ -986,9 +974,8 @@ public function hasMany()
      * recognized as there's only one Doctrine_Relation object on the owning
      * side.
      *
-     * @param string $alias the relation alias to search for
-     *
-     * @return bool true if the relation exists. Otherwise false.
+     * @param  string $alias the relation alias to search for
+     * @return bool   true if the relation exists. Otherwise false.
      */
     public function hasRelation($alias)
     {
@@ -998,8 +985,7 @@ public function hasRelation($alias)
     /**
      * Retrieves a relation object for this component.
      *
-     * @param string $alias relation alias; @see hasRelation()
-     *
+     * @param  string            $alias relation alias; @see hasRelation()
      * @return Doctrine_Relation
      */
     public function getRelation($alias, $recursive = true)
@@ -1028,8 +1014,7 @@ public function getRelations()
      *       ->where('myuser.Phonenumber = ?', '5551234');
      * </code>
      *
-     * @param string $alias name for component aliasing
-     *
+     * @param  string         $alias name for component aliasing
      * @return Doctrine_Query
      */
     public function createQuery($alias = '')
@@ -1063,9 +1048,8 @@ public function getRepository()
      *
      * @see Doctrine_Table::$_options   for available options
      *
-     * @param string $name  the name of the option to set
-     * @param mixed  $value the value of the option
-     *
+     * @param  string         $name  the name of the option to set
+     * @param  mixed          $value the value of the option
      * @return Doctrine_Table this object
      */
     public function setOption($name, $value)
@@ -1091,9 +1075,8 @@ public function setOption($name, $value)
      *
      * @see Doctrine_Table::$_options   for available options
      *
-     * @param string $name the name of the option
-     *
-     * @return mixed the value of given option
+     * @param  string $name the name of the option
+     * @return mixed  the value of given option
      */
     public function getOption($name)
     {
@@ -1107,9 +1090,8 @@ public function getOption($name)
     /**
      * Get the table orderby statement.
      *
-     * @param string $alias       The alias to use
-     * @param bool   $columnNames Whether or not to use column names instead of field names
-     *
+     * @param  string $alias       The alias to use
+     * @param  bool   $columnNames Whether or not to use column names instead of field names
      * @return string $orderByStatement
      */
     public function getOrderByStatement($alias = null, $columnNames = false)
@@ -1123,10 +1105,9 @@ public function getOrderByStatement($alias = null, $columnNames = false)
      * Process an order by statement to be prefixed with the passed alias and
      * field names converted to column names if the 3rd argument is true.
      *
-     * @param string $alias       The alias to prefix columns with
-     * @param string $orderBy     The order by to process
-     * @param string $columnNames Whether or not to convert field names to column names
-     *
+     * @param  string $alias       The alias to prefix columns with
+     * @param  string $orderBy     The order by to process
+     * @param  string $columnNames Whether or not to convert field names to column names
      * @return string $orderBy
      */
     public function processOrderBy($alias, $orderBy, $columnNames = false)
@@ -1193,9 +1174,8 @@ public function getColumnName($fieldName)
     /**
      * Retrieves a column definition from this table schema.
      *
-     * @param string $columnName
-     *
-     * @return array column definition; @see $_columns
+     * @param  string $columnName
+     * @return array  column definition; @see $_columns
      */
     public function getColumnDefinition($columnName)
     {
@@ -1211,8 +1191,7 @@ public function getColumnDefinition($columnName)
      *
      * If no alias can be found the column name is returned.
      *
-     * @param string $columnName column name
-     *
+     * @param  string $columnName column name
      * @return string column alias
      */
     public function getFieldName($columnName)
@@ -1296,12 +1275,11 @@ public function setColumns(array $definitions)
      *
      * @see $_columns;
      *
-     * @param string $name    column physical name
-     * @param string $type    type of data
-     * @param int    $length  maximum length
-     * @param bool   $prepend Whether to prepend or append the new column to the column list.
-     *                        By default the column gets appended.
-     *
+     * @param  string                   $name    column physical name
+     * @param  string                   $type    type of data
+     * @param  int                      $length  maximum length
+     * @param  bool                     $prepend Whether to prepend or append the new column to the column list.
+     *                                           By default the column gets appended.
      * @throws Doctrine_Table_Exception if trying use wrongly typed parameter
      */
     public function setColumn($name, $type = null, $length = null, $options = array(), $prepend = false)
@@ -1440,9 +1418,8 @@ public function hasDefaultValues()
     /**
      * Retrieves the default value (if any) for a given column.
      *
-     * @param string $fieldName column name
-     *
-     * @return mixed default value as set in definition
+     * @param  string $fieldName column name
+     * @return mixed  default value as set in definition
      */
     public function getDefaultValueOf($fieldName)
     {
@@ -1484,8 +1461,7 @@ public function getIdentifierType()
     /**
      * Finds out whether the table definition contains a given column.
      *
-     * @param string $columnName
-     *
+     * @param  string $columnName
      * @return bool
      */
     public function hasColumn($columnName)
@@ -1499,8 +1475,7 @@ public function hasColumn($columnName)
      * This method returns true if @see hasColumn() returns true or if an alias
      * named $fieldName exists.
      *
-     * @param string $fieldName
-     *
+     * @param  string $fieldName
      * @return bool
      */
     public function hasField($fieldName)
@@ -1514,9 +1489,8 @@ public function hasField($fieldName)
      * This method assign the connection which this table will use
      * to create queries.
      *
-     * @param Doctrine_Connection $conn a connection object
-     *
-     * @return Doctrine_Table this object; fluent interface
+     * @param  Doctrine_Connection $conn a connection object
+     * @return Doctrine_Table      this object; fluent interface
      */
     public function setConnection(Doctrine_Connection $conn)
     {
@@ -1584,8 +1558,7 @@ public function addNamedQuery($queryKey, $query)
      *
      * @see addNamedQuery()
      *
-     * @param string $queryKey query key name
-     *
+     * @param  string         $queryKey query key name
      * @return Doctrine_Query
      */
     public function createNamedQuery($queryKey)
@@ -1670,8 +1643,7 @@ public function find()
     /**
      * Retrieves all the records stored in this table.
      *
-     * @param int $hydrationMode Doctrine_Core::HYDRATE_ARRAY or Doctrine_Core::HYDRATE_RECORD
-     *
+     * @param  int                       $hydrationMode Doctrine_Core::HYDRATE_ARRAY or Doctrine_Core::HYDRATE_RECORD
      * @return Doctrine_Collection|array
      */
     public function findAll($hydrationMode = null)
@@ -1682,10 +1654,9 @@ public function findAll($hydrationMode = null)
     /**
      * Finds records in this table with a given SQL where clause.
      *
-     * @param string $dql           DQL WHERE clause to use
-     * @param array  $params        query parameters (a la PDO)
-     * @param int    $hydrationMode Doctrine_Core::HYDRATE_ARRAY or Doctrine_Core::HYDRATE_RECORD
-     *
+     * @param  string                    $dql           DQL WHERE clause to use
+     * @param  array                     $params        query parameters (a la PDO)
+     * @param  int                       $hydrationMode Doctrine_Core::HYDRATE_ARRAY or Doctrine_Core::HYDRATE_RECORD
      * @return Doctrine_Collection|array
      *
      * @todo This actually takes DQL, not SQL, but it requires column names
@@ -1701,10 +1672,9 @@ public function findBySql($dql, $params = array(), $hydrationMode = null)
     /**
      * Finds records in this table with a given DQL where clause.
      *
-     * @param string $dql           DQL WHERE clause
-     * @param array  $params        preparated statement parameters
-     * @param int    $hydrationMode Doctrine_Core::HYDRATE_ARRAY or Doctrine_Core::HYDRATE_RECORD
-     *
+     * @param  string                    $dql           DQL WHERE clause
+     * @param  array                     $params        preparated statement parameters
+     * @param  int                       $hydrationMode Doctrine_Core::HYDRATE_ARRAY or Doctrine_Core::HYDRATE_RECORD
      * @return Doctrine_Collection|array
      */
     public function findByDql($dql, $params = array(), $hydrationMode = null)
@@ -1718,9 +1688,8 @@ public function findByDql($dql, $params = array(), $hydrationMode = null)
     /**
      * Find records basing on a field.
      *
-     * @param string|array $value         prepared statement parameter
-     * @param int          $hydrationMode Doctrine_Core::HYDRATE_ARRAY or Doctrine_Core::HYDRATE_RECORD
-     *
+     * @param  string|array              $value         prepared statement parameter
+     * @param  int                       $hydrationMode Doctrine_Core::HYDRATE_ARRAY or Doctrine_Core::HYDRATE_RECORD
      * @return Doctrine_Collection|array
      */
     public function findBy($fieldName, $value, $hydrationMode = null)
@@ -1734,9 +1703,8 @@ public function findBy($fieldName, $value, $hydrationMode = null)
     /**
      * Finds the first record that satisfy the clause.
      *
-     * @param string|array $value         prepared statement parameter
-     * @param int          $hydrationMode Doctrine_Core::HYDRATE_ARRAY or Doctrine_Core::HYDRATE_RECORD
-     *
+     * @param  string|array    $value         prepared statement parameter
+     * @param  int             $hydrationMode Doctrine_Core::HYDRATE_ARRAY or Doctrine_Core::HYDRATE_RECORD
      * @return Doctrine_Record
      */
     public function findOneBy($fieldName, $value, $hydrationMode = null)
@@ -1754,13 +1722,11 @@ public function findOneBy($fieldName, $value, $hydrationMode = null)
      * This method fetches data using the provided $queryKey to choose a named
      * query in the query registry.
      *
-     * @param string $queryKey      the query key
-     * @param array  $params        prepared statement params (if any)
-     * @param int    $hydrationMode Doctrine_Core::HYDRATE_ARRAY or Doctrine_Core::HYDRATE_RECORD
-     *
+     * @param  string                    $queryKey      the query key
+     * @param  array                     $params        prepared statement params (if any)
+     * @param  int                       $hydrationMode Doctrine_Core::HYDRATE_ARRAY or Doctrine_Core::HYDRATE_RECORD
      * @return Doctrine_Collection|array
-     *
-     * @throws Doctrine_Query_Registry if no query for given queryKey is found
+     * @throws Doctrine_Query_Registry   if no query for given queryKey is found
      */
     public function execute($queryKey, $params = array(), $hydrationMode = Doctrine_Core::HYDRATE_RECORD)
     {
@@ -1773,12 +1739,10 @@ public function execute($queryKey, $params = array(), $hydrationMode = Doctrine_
      * This method uses the provided $queryKey to clone and execute
      * the associated named query in the query registry.
      *
-     * @param string $queryKey      the query key
-     * @param array  $params        prepared statement params (if any)
-     * @param int    $hydrationMode Doctrine_Core::HYDRATE_ARRAY or Doctrine_Core::HYDRATE_RECORD
-     *
+     * @param  string                  $queryKey      the query key
+     * @param  array                   $params        prepared statement params (if any)
+     * @param  int                     $hydrationMode Doctrine_Core::HYDRATE_ARRAY or Doctrine_Core::HYDRATE_RECORD
      * @return Doctrine_Record|array
-     *
      * @throws Doctrine_Query_Registry if no query for given queryKey is found
      */
     public function executeOne($queryKey, $params = array(), $hydrationMode = Doctrine_Core::HYDRATE_RECORD)
@@ -1804,9 +1768,8 @@ public function clear()
      * This method is used internally to cache records, ensuring that only one
      * object that represents a sql record exists in all scopes.
      *
-     * @param Doctrine_Record $record record to be added
-     *
-     * @return bool true if record was not present in the map
+     * @param  Doctrine_Record $record record to be added
+     * @return bool            true if record was not present in the map
      *
      * @todo Better name? registerRecord?
      */
@@ -1833,10 +1796,9 @@ public function addRecord(Doctrine_Record $record)
      * This method deletes from the cache the given record; can be used to
      * force reloading of an object from database.
      *
-     * @param Doctrine_Record $record record to remove from cache
-     *
-     * @return bool true if the record was found and removed,
-     *              false if the record wasn't found
+     * @param  Doctrine_Record $record record to remove from cache
+     * @return bool            true if the record was found and removed,
+     *                         false if the record wasn't found
      */
     public function removeRecord(Doctrine_Record $record)
     {
@@ -1960,10 +1922,8 @@ public function getClassnameToReturn()
     }
 
     /**
-     * @param $id database row id
-     *
+     * @param                          $id database row id
      * @return Doctrine_Record
-     *
      * @throws Doctrine_Find_Exception
      */
     final public function getProxy($id = null)
@@ -1990,8 +1950,7 @@ final public function getProxy($id = null)
     /**
      * applyInheritance.
      *
-     * @param $where query where part to be modified
-     *
+     * @param         $where query where part to be modified
      * @return string query where part with column aggregation inheritance added
      */
     final public function applyInheritance($where)
@@ -2033,8 +1992,7 @@ public function getQueryObject()
     /**
      * Retrieves the enum values for a given field.
      *
-     * @param string $fieldName
-     *
+     * @param  string $fieldName
      * @return array
      */
     public function getEnumValues($fieldName)
@@ -2076,10 +2034,9 @@ public function enumValue($fieldName, $index)
      *
      * @see enumValue()
      *
-     * @param string $fieldName
-     * @param mixed  $value     value of the enum considered
-     *
-     * @return int can be string if native enums are used
+     * @param  string $fieldName
+     * @param  mixed  $value     value of the enum considered
+     * @return int    can be string if native enums are used
      */
     public function enumIndex($fieldName, $value)
     {
@@ -2097,10 +2054,9 @@ public function enumIndex($fieldName, $value)
      *
      * @see Doctrine_Core::ATTR_VALIDATE
      *
-     * @param string          $fieldName
-     * @param string          $value
-     * @param Doctrine_Record $record    record to consider; if it does not exists, it is created
-     *
+     * @param  string                        $fieldName
+     * @param  string                        $value
+     * @param  Doctrine_Record               $record    record to consider; if it does not exists, it is created
      * @return Doctrine_Validator_ErrorStack $errorStack
      */
     public function validateField($fieldName, $value, Doctrine_Record $record = null)
@@ -2233,10 +2189,9 @@ public function getColumns()
     /**
      * Removes a field name from the table schema information.
      *
-     * @param string $fieldName
-     *
-     * @return bool true if the field is found and removed.
-     *              False otherwise.
+     * @param  string $fieldName
+     * @return bool   true if the field is found and removed.
+     *                False otherwise.
      */
     public function removeColumn($fieldName)
     {
@@ -2307,9 +2262,8 @@ public function getFieldNames()
      * This method retrieves the definition of the column, basing of $fieldName
      * which can be a column name or a field name (alias).
      *
-     * @param string $fieldName
-     *
-     * @return array false on failure
+     * @param  string $fieldName
+     * @return array  false on failure
      */
     public function getDefinitionOf($fieldName)
     {
@@ -2321,8 +2275,7 @@ public function getDefinitionOf($fieldName)
     /**
      * Retrieves the type of a field.
      *
-     * @param string $fieldName
-     *
+     * @param  string $fieldName
      * @return string false on failure
      */
     public function getTypeOf($fieldName)
@@ -2333,8 +2286,7 @@ public function getTypeOf($fieldName)
     /**
      * Retrieves the type of a column.
      *
-     * @param string $columnName
-     *
+     * @param  string $columnName
      * @return string false if column is not found
      */
     public function getTypeOfColumn($columnName)
@@ -2383,13 +2335,11 @@ public function getData()
      * $table->prepareValue($field, $value); // Doctrine_Null
      * </code>
      *
-     * @param string $value    field value
-     * @param string $typeHint Type hint used to pass in the type of the value to prepare
-     *                         if it is already known. This enables the method to skip
-     *                         the type determination. Used i.e. during hydration.
-     *
-     * @return mixed prepared value
-     *
+     * @param  string                   $value    field value
+     * @param  string                   $typeHint Type hint used to pass in the type of the value to prepare
+     *                                            if it is already known. This enables the method to skip
+     *                                            the type determination. Used i.e. during hydration.
+     * @return mixed                    prepared value
      * @throws Doctrine_Table_Exception if unserialization of array/object typed column fails or
      * @throws Doctrine_Table_Exception if uncompression of gzip typed column fails         *
      */
@@ -2522,10 +2472,8 @@ public function getTemplates()
      * This method retrieves a behavior/template object attached to the table.
      * For Doctrine_Template_* classes, the base name can be used.
      *
-     * @param string $template name of the behavior
-     *
+     * @param  string                   $template name of the behavior
      * @return Doctrine_Template
-     *
      * @throws Doctrine_Table_Exception if the given template is
      *                                  not set on this table
      */
@@ -2544,8 +2492,7 @@ public function getTemplate($template)
     /**
      * Checks if the table has a given template.
      *
-     * @param string $template name of template; @see getTemplate()
-     *
+     * @param  string $template name of template; @see getTemplate()
      * @return bool
      */
     public function hasTemplate($template)
@@ -2556,9 +2503,8 @@ public function hasTemplate($template)
     /**
      * Adds a template to this table.
      *
-     * @param string            $template template name
-     * @param Doctrine_Template $impl     behavior to attach
-     *
+     * @param  string            $template template name
+     * @param  Doctrine_Template $impl     behavior to attach
      * @return Doctrine_Table
      */
     public function addTemplate($template, Doctrine_Template $impl)
@@ -2581,8 +2527,7 @@ public function getGenerators()
     /**
      * Gets generator instance for a passed name.
      *
-     * @param string $generator
-     *
+     * @param  string                    $generator
      * @return Doctrine_Record_Generator $generator
      */
     public function getGenerator($generator)
@@ -2607,8 +2552,7 @@ public function hasGenerator($generator)
     /**
      * Adds a generate to the table instance.
      *
-     * @param string $name
-     *
+     * @param  string         $name
      * @return Doctrine_Table
      */
     public function addGenerator(Doctrine_Record_Generator $generator, $name = null)
@@ -2655,8 +2599,7 @@ public function getParentGenerator()
      *
      * @see bindQueryPart()
      *
-     * @param array $queryParts an array of pre-bound query parts
-     *
+     * @param  array          $queryParts an array of pre-bound query parts
      * @return Doctrine_Table this object
      */
     public function bindQueryParts(array $queryParts)
@@ -2672,8 +2615,7 @@ public function bindQueryParts(array $queryParts)
      * This method binds given value to given query part.
      * Every query created by this table will have this part set by default.
      *
-     * @param string $queryPart
-     *
+     * @param  string          $queryPart
      * @return Doctrine_Record this object
      */
     public function bindQueryPart($queryPart, $value)
@@ -2686,9 +2628,8 @@ public function bindQueryPart($queryPart, $value)
     /**
      * Gets the names of all validators being applied on a field.
      *
-     * @param string $fieldName
-     *
-     * @return array names of validators
+     * @param  string $fieldName
+     * @return array  names of validators
      */
     public function getFieldValidators($fieldName)
     {
@@ -2736,8 +2677,7 @@ public function getFieldValidators($fieldName)
      * For integer fields, length is bytes occupied.
      * For decimal fields, it is the total number of cyphers.
      *
-     * @param string $fieldName
-     *
+     * @param  string $fieldName
      * @return int
      */
     public function getFieldLength($fieldName)
@@ -2750,8 +2690,7 @@ public function getFieldLength($fieldName)
      *
      * @see bindQueryPart()
      *
-     * @param string $queryPart field interested
-     *
+     * @param  string $queryPart field interested
      * @return string value of the bind
      */
     public function getBoundQueryPart($queryPart)
@@ -2888,8 +2827,7 @@ public function buildFindByWhere($fieldName)
      * version of their column name. It will be inflected with Doctrine_Inflector::tableize()
      * to get the column or field name.
      *
-     * @param string $name
-     *
+     * @param  string $name
      * @return string $fieldName
      */
     protected function _resolveFindByFieldName($name)
@@ -2908,10 +2846,8 @@ protected function _resolveFindByFieldName($name)
     /**
      * deletes table row(s) matching the specified identifier.
      *
-     * @param mixed $identifier an associateve array containing identifier column-value pairs
-     *
-     * @return int the number of affected rows. Boolean false if empty value array was given,
-     *
+     * @param  mixed                         $identifier an associateve array containing identifier column-value pairs
+     * @return int                           the number of affected rows. Boolean false if empty value array was given,
      * @throws Doctrine_Connection_Exception if something went wrong at the database level
      */
     public function delete($identifier)
@@ -2922,10 +2858,9 @@ public function delete($identifier)
     /**
      * Inserts a table row with specified data.
      *
-     * @param array $fields An associative array containing column-value pairs.
-     *                      Values can be strings or Doctrine_Expression instances.
-     *
-     * @return int the number of affected rows. Boolean false if empty value array was given,
+     * @param  array $fields An associative array containing column-value pairs.
+     *                       Values can be strings or Doctrine_Expression instances.
+     * @return int   the number of affected rows. Boolean false if empty value array was given,
      */
     public function insert(array $fields)
     {
@@ -2935,12 +2870,10 @@ public function insert(array $fields)
     /**
      * Updates table row(s) with specified data.
      *
-     * @param array $fields     An associative array containing column-value pairs.
-     *                          Values can be strings or Doctrine_Expression instances.
-     * @param mixed $identifier an associateve array containing identifier column-value pairs
-     *
-     * @return int the number of affected rows. Boolean false if empty value array was given,
-     *
+     * @param  array                         $fields     An associative array containing column-value pairs.
+     *                                                   Values can be strings or Doctrine_Expression instances.
+     * @param  mixed                         $identifier an associateve array containing identifier column-value pairs
+     * @return int                           the number of affected rows. Boolean false if empty value array was given,
      * @throws Doctrine_Connection_Exception if something went wrong at the database level
      */
     public function update(array $fields, $identifier)
@@ -2971,7 +2904,6 @@ public function update(array $fields, $identifier)
      *                          the provided key fields
      *
      *                          this method will fail if no key fields are specified
-     *
      * @throws Doctrine_Connection_Exception if this driver doesn't support replace
      * @throws Doctrine_Connection_Exception if some of the key values was null
      * @throws Doctrine_Connection_Exception if there were no key fields
diff --git a/lib/Doctrine/Table/Exception.php b/lib/Doctrine/Table/Exception.php
index 812cbd5be..c55a779ea 100644
--- a/lib/Doctrine/Table/Exception.php
+++ b/lib/Doctrine/Table/Exception.php
@@ -23,12 +23,7 @@
  * thrown when user tries to initialize a new instance of Doctrine_Table,
  * while there already exists an instance of that table.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7490 $
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
diff --git a/lib/Doctrine/Table/Repository.php b/lib/Doctrine/Table/Repository.php
index 7a22fbf99..79e926663 100644
--- a/lib/Doctrine/Table/Repository.php
+++ b/lib/Doctrine/Table/Repository.php
@@ -25,12 +25,8 @@
  * loaded from the database or retrieved from the cache.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7490 $
  */
 class Doctrine_Table_Repository implements Countable, IteratorAggregate
 {
@@ -67,8 +63,7 @@ public function getTable()
     /**
      * add.
      *
-     * @param Doctrine_Record $record record to be added into registry
-     *
+     * @param  Doctrine_Record $record record to be added into registry
      * @return bool
      */
     public function add(Doctrine_Record $record)
@@ -86,8 +81,7 @@ public function add(Doctrine_Record $record)
     /**
      * get.
      *
-     * @param int $oid
-     *
+     * @param  int                                 $oid
      * @throws Doctrine_Table_Repository_Exception
      */
     public function get($oid)
@@ -112,8 +106,7 @@ public function count()
     }
 
     /**
-     * @param int $oid object identifier
-     *
+     * @param  int  $oid object identifier
      * @return bool whether ot not the operation was successful
      */
     public function evict($oid)
diff --git a/lib/Doctrine/Table/Repository/Exception.php b/lib/Doctrine/Table/Repository/Exception.php
index d18c58bed..7ceefb7b0 100644
--- a/lib/Doctrine/Table/Repository/Exception.php
+++ b/lib/Doctrine/Table/Repository/Exception.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Table_Repository_Exception.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7490 $
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
diff --git a/lib/Doctrine/Table/Repository/None.php b/lib/Doctrine/Table/Repository/None.php
index fc20cb80a..f3ed54663 100644
--- a/lib/Doctrine/Table/Repository/None.php
+++ b/lib/Doctrine/Table/Repository/None.php
@@ -25,20 +25,15 @@
  * loaded from the database or retrieved from the cache.
  *
  * @author      Jérôme Macias <jmacias@groupe-exp.com>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 115 $
  */
 class Doctrine_Table_Repository_None extends Doctrine_Table_Repository implements Countable, IteratorAggregate
 {
     /**
      * add.
      *
-     * @param Doctrine_Record $record record to be added into registry
-     *
+     * @param  Doctrine_Record $record record to be added into registry
      * @return bool
      */
     public function add(Doctrine_Record $record)
@@ -49,8 +44,7 @@ public function add(Doctrine_Record $record)
     /**
      * get.
      *
-     * @param int $oid
-     *
+     * @param  int                                 $oid
      * @throws Doctrine_Table_Repository_Exception
      */
     public function get($oid)
@@ -73,8 +67,7 @@ public function count()
     /**
      * evict.
      *
-     * @param int $oid object identifier
-     *
+     * @param  int  $oid object identifier
      * @return bool whether ot not the operation was successful
      */
     public function evict($oid)
diff --git a/lib/Doctrine/Task.php b/lib/Doctrine/Task.php
index b375a49ee..e4750a63e 100644
--- a/lib/Doctrine/Task.php
+++ b/lib/Doctrine/Task.php
@@ -24,12 +24,7 @@
  *
  * Abstract class used for writing Doctrine Tasks
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 2761 $
  *
  * @author      Jonathan H. Wage <jwage@mac.com>
  */
@@ -77,8 +72,7 @@ public function __construct($dispatcher = null)
      * This is public so we can easily test its reactions to fully-qualified class names, without having to add
      * PHP 5.3-specific test code
      *
-     * @param string $className
-     *
+     * @param  string      $className
      * @return string|bool
      */
     public static function deriveTaskName($className)
@@ -199,8 +193,7 @@ public function setArguments(array $args)
     /**
      * Returns TRUE if the specified task name is valid, or FALSE otherwise.
      *
-     * @param string $taskName
-     *
+     * @param  string $taskName
      * @return bool
      */
     protected static function validateTaskName($taskName)
@@ -215,8 +208,7 @@ protected static function validateTaskName($taskName)
     /**
      * Sets the name of the task, the name that's used to invoke it through a CLI.
      *
-     * @param string $taskName
-     *
+     * @param  string                   $taskName
      * @throws InvalidArgumentException If the task name is invalid
      */
     protected function setTaskName($taskName)
diff --git a/lib/Doctrine/Task/BuildAll.php b/lib/Doctrine/Task/BuildAll.php
index 1219c4596..9c2401fb5 100644
--- a/lib/Doctrine/Task/BuildAll.php
+++ b/lib/Doctrine/Task/BuildAll.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Task_BuildAll.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 2761 $
  *
  * @author      Jonathan H. Wage <jwage@mac.com>
  */
diff --git a/lib/Doctrine/Task/BuildAllLoad.php b/lib/Doctrine/Task/BuildAllLoad.php
index b9c6c9c24..832e22e91 100644
--- a/lib/Doctrine/Task/BuildAllLoad.php
+++ b/lib/Doctrine/Task/BuildAllLoad.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Task_BuildAllLoad.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 2761 $
  *
  * @author      Jonathan H. Wage <jwage@mac.com>
  */
diff --git a/lib/Doctrine/Task/BuildAllReload.php b/lib/Doctrine/Task/BuildAllReload.php
index 2a1c3b769..a3438da90 100644
--- a/lib/Doctrine/Task/BuildAllReload.php
+++ b/lib/Doctrine/Task/BuildAllReload.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Task_BuildAllReload.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 2761 $
  *
  * @author      Jonathan H. Wage <jwage@mac.com>
  */
diff --git a/lib/Doctrine/Task/Compile.php b/lib/Doctrine/Task/Compile.php
index d75a56bff..bd7b0f46e 100644
--- a/lib/Doctrine/Task/Compile.php
+++ b/lib/Doctrine/Task/Compile.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Task_Compile.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 2761 $
  *
  * @author      Jonathan H. Wage <jwage@mac.com>
  */
diff --git a/lib/Doctrine/Task/CreateDb.php b/lib/Doctrine/Task/CreateDb.php
index 9ec74ef32..550f502a8 100644
--- a/lib/Doctrine/Task/CreateDb.php
+++ b/lib/Doctrine/Task/CreateDb.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Task_CreateDb.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 2761 $
  *
  * @author      Jonathan H. Wage <jwage@mac.com>
  */
diff --git a/lib/Doctrine/Task/CreateTables.php b/lib/Doctrine/Task/CreateTables.php
index 52adce9cf..7ee8e609a 100644
--- a/lib/Doctrine/Task/CreateTables.php
+++ b/lib/Doctrine/Task/CreateTables.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Task_CreateTables.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 2761 $
  *
  * @author      Jonathan H. Wage <jwage@mac.com>
  */
diff --git a/lib/Doctrine/Task/Dql.php b/lib/Doctrine/Task/Dql.php
index 71e463521..b36576d77 100644
--- a/lib/Doctrine/Task/Dql.php
+++ b/lib/Doctrine/Task/Dql.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Task_Dql.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 2761 $
  *
  * @author      Jonathan H. Wage <jwage@mac.com>
  */
diff --git a/lib/Doctrine/Task/DropDb.php b/lib/Doctrine/Task/DropDb.php
index d9997d524..6aaadfd0d 100644
--- a/lib/Doctrine/Task/DropDb.php
+++ b/lib/Doctrine/Task/DropDb.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Task_DropDb.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 2761 $
  *
  * @author      Jonathan H. Wage <jwage@mac.com>
  */
diff --git a/lib/Doctrine/Task/DumpData.php b/lib/Doctrine/Task/DumpData.php
index 45fb11d66..d531145ba 100644
--- a/lib/Doctrine/Task/DumpData.php
+++ b/lib/Doctrine/Task/DumpData.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Task_DumpData.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 2761 $
  *
  * @author      Jonathan H. Wage <jwage@mac.com>
  */
diff --git a/lib/Doctrine/Task/Exception.php b/lib/Doctrine/Task/Exception.php
index cc315be4e..21e9c3b4b 100644
--- a/lib/Doctrine/Task/Exception.php
+++ b/lib/Doctrine/Task/Exception.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Task_Exception.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 2761 $
  *
  * @author      Jonathan H. Wage <jwage@mac.com>
  */
diff --git a/lib/Doctrine/Task/GenerateMigration.php b/lib/Doctrine/Task/GenerateMigration.php
index c720d5f76..9e0744431 100644
--- a/lib/Doctrine/Task/GenerateMigration.php
+++ b/lib/Doctrine/Task/GenerateMigration.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Task_GenerateMigration.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 2761 $
  *
  * @author      Jonathan H. Wage <jwage@mac.com>
  */
diff --git a/lib/Doctrine/Task/GenerateMigrationsDb.php b/lib/Doctrine/Task/GenerateMigrationsDb.php
index 982f78948..e9a95404b 100644
--- a/lib/Doctrine/Task/GenerateMigrationsDb.php
+++ b/lib/Doctrine/Task/GenerateMigrationsDb.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Task_GenerateMigrationsDb.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 2761 $
  *
  * @author      Jonathan H. Wage <jwage@mac.com>
  */
diff --git a/lib/Doctrine/Task/GenerateMigrationsDiff.php b/lib/Doctrine/Task/GenerateMigrationsDiff.php
index 083fe649e..4281a23a2 100644
--- a/lib/Doctrine/Task/GenerateMigrationsDiff.php
+++ b/lib/Doctrine/Task/GenerateMigrationsDiff.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Task_GenerateMigrationsDiff.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 2761 $
  *
  * @author      Jonathan H. Wage <jwage@mac.com>
  */
diff --git a/lib/Doctrine/Task/GenerateMigrationsModels.php b/lib/Doctrine/Task/GenerateMigrationsModels.php
index 8ff14cf05..040a9a8dd 100644
--- a/lib/Doctrine/Task/GenerateMigrationsModels.php
+++ b/lib/Doctrine/Task/GenerateMigrationsModels.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Task_GenerateMigrationsModels.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 2761 $
  *
  * @author      Jonathan H. Wage <jwage@mac.com>
  */
diff --git a/lib/Doctrine/Task/GenerateModelsDb.php b/lib/Doctrine/Task/GenerateModelsDb.php
index eb545b019..5bdc85ac8 100644
--- a/lib/Doctrine/Task/GenerateModelsDb.php
+++ b/lib/Doctrine/Task/GenerateModelsDb.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Task_GenerateModelsDb.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 2761 $
  *
  * @author      Jonathan H. Wage <jwage@mac.com>
  */
diff --git a/lib/Doctrine/Task/GenerateModelsYaml.php b/lib/Doctrine/Task/GenerateModelsYaml.php
index 7411c3f97..499b0a09c 100644
--- a/lib/Doctrine/Task/GenerateModelsYaml.php
+++ b/lib/Doctrine/Task/GenerateModelsYaml.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Task_GenerateModelsYaml.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 2761 $
  *
  * @author      Jonathan H. Wage <jwage@mac.com>
  */
diff --git a/lib/Doctrine/Task/GenerateSql.php b/lib/Doctrine/Task/GenerateSql.php
index ce0068d77..67eb4da68 100644
--- a/lib/Doctrine/Task/GenerateSql.php
+++ b/lib/Doctrine/Task/GenerateSql.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Task_GenerateSql.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 2761 $
  *
  * @author      Jonathan H. Wage <jwage@mac.com>
  */
diff --git a/lib/Doctrine/Task/GenerateYamlDb.php b/lib/Doctrine/Task/GenerateYamlDb.php
index 92248c85f..dc740aca7 100644
--- a/lib/Doctrine/Task/GenerateYamlDb.php
+++ b/lib/Doctrine/Task/GenerateYamlDb.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Task_GenerateYamlDb.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 2761 $
  *
  * @author      Jonathan H. Wage <jwage@mac.com>
  */
diff --git a/lib/Doctrine/Task/GenerateYamlModels.php b/lib/Doctrine/Task/GenerateYamlModels.php
index d287e641d..9a3ade2f2 100644
--- a/lib/Doctrine/Task/GenerateYamlModels.php
+++ b/lib/Doctrine/Task/GenerateYamlModels.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Task_GenerateFromModels.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 2761 $
  *
  * @author      Jonathan H. Wage <jwage@mac.com>
  */
diff --git a/lib/Doctrine/Task/LoadData.php b/lib/Doctrine/Task/LoadData.php
index 7f2f5264a..e2e3646fb 100644
--- a/lib/Doctrine/Task/LoadData.php
+++ b/lib/Doctrine/Task/LoadData.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Task_LoadData.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 2761 $
  *
  * @author      Jonathan H. Wage <jwage@mac.com>
  */
diff --git a/lib/Doctrine/Task/Migrate.php b/lib/Doctrine/Task/Migrate.php
index c23e8773f..fa29a2983 100644
--- a/lib/Doctrine/Task/Migrate.php
+++ b/lib/Doctrine/Task/Migrate.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Task_Migrate.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 2761 $
  *
  * @author      Jonathan H. Wage <jwage@mac.com>
  */
diff --git a/lib/Doctrine/Task/RebuildDb.php b/lib/Doctrine/Task/RebuildDb.php
index 085dd723d..319565c7e 100644
--- a/lib/Doctrine/Task/RebuildDb.php
+++ b/lib/Doctrine/Task/RebuildDb.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Task_RebuildDb.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 2761 $
  *
  * @author      Jonathan H. Wage <jwage@mac.com>
  */
diff --git a/lib/Doctrine/Template.php b/lib/Doctrine/Template.php
index 2b03d97fb..bffc30c4f 100644
--- a/lib/Doctrine/Template.php
+++ b/lib/Doctrine/Template.php
@@ -23,12 +23,7 @@
  * Base abstract class for defining templates which are the base of all behaviors that can be attached
  * to your Doctrine models.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
@@ -80,8 +75,7 @@ public function getTable()
     /**
      * sets the last used invoker.
      *
-     * @param Doctrine_Record $invoker the record that invoked the last delegated call
-     *
+     * @param  Doctrine_Record   $invoker the record that invoked the last delegated call
      * @return Doctrine_Template this object
      */
     public function setInvoker(Doctrine_Record_Abstract $invoker)
@@ -144,10 +138,9 @@ public function getOptions()
      * getOption
      * returns the value of given option.
      *
-     * @param string $name    the name of the option
-     * @param mixed  $default default value if option is not found
-     *
-     * @return mixed the value of given option
+     * @param  string $name    the name of the option
+     * @param  mixed  $default default value if option is not found
+     * @return mixed  the value of given option
      */
     public function getOption($name, $default = null)
     {
diff --git a/lib/Doctrine/Template/Geographical.php b/lib/Doctrine/Template/Geographical.php
index dc9429afa..9768d8d67 100644
--- a/lib/Doctrine/Template/Geographical.php
+++ b/lib/Doctrine/Template/Geographical.php
@@ -23,12 +23,7 @@
  * Easily add longitude and latitude columns to your records and use inherited functionality for
  * calculating distances.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  * @author      Jonathan H. Wage <jonwage@gmail.com>
@@ -89,8 +84,7 @@ public function getDistanceQuery()
     /**
      * Get distance between this record and another.
      *
-     * @param string $kilometers
-     *
+     * @param  string $kilometers
      * @return int
      */
     public function getDistance(Doctrine_Record $record, $kilometers = false)
diff --git a/lib/Doctrine/Template/I18n.php b/lib/Doctrine/Template/I18n.php
index 1bd0b2a3f..dd0bb30f4 100644
--- a/lib/Doctrine/Template/I18n.php
+++ b/lib/Doctrine/Template/I18n.php
@@ -22,12 +22,7 @@
 /**
  * Add multilingual capabilities to your Doctrine models.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
diff --git a/lib/Doctrine/Template/Listener/Sluggable.php b/lib/Doctrine/Template/Listener/Sluggable.php
index acc07ebc0..c92b692bd 100644
--- a/lib/Doctrine/Template/Listener/Sluggable.php
+++ b/lib/Doctrine/Template/Listener/Sluggable.php
@@ -22,12 +22,7 @@
 /**
  * Easily create a slug for each record based on a specified set of fields.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
@@ -90,9 +85,8 @@ public function preUpdate(Doctrine_Event $event)
     /**
      * Generate the slug for a given Doctrine_Record based on the configured options.
      *
-     * @param Doctrine_Record $record
-     *
-     * @return string $slug
+     * @param  Doctrine_Record $record
+     * @return string          $slug
      */
     protected function buildSlugFromFields($record)
     {
@@ -122,9 +116,8 @@ protected function buildSlugFromFields($record)
     /**
      * Generate the slug for a given Doctrine_Record slug field.
      *
-     * @param Doctrine_Record $record
-     *
-     * @return string $slug
+     * @param  Doctrine_Record $record
+     * @return string          $slug
      */
     protected function buildSlugFromSlugField($record)
     {
@@ -142,10 +135,9 @@ protected function buildSlugFromSlugField($record)
      * Creates a unique slug for a given Doctrine_Record. This function enforces the uniqueness by
      * incrementing the values with a postfix if the slug is not unique.
      *
-     * @param Doctrine_Record $record
-     * @param string          $slugFromFields
-     *
-     * @return string $slug
+     * @param  Doctrine_Record $record
+     * @param  string          $slugFromFields
+     * @return string          $slug
      */
     public function getUniqueSlug($record, $slugFromFields)
     {
diff --git a/lib/Doctrine/Template/Listener/SoftDelete.php b/lib/Doctrine/Template/Listener/SoftDelete.php
index 172464e61..72b81b5f0 100644
--- a/lib/Doctrine/Template/Listener/SoftDelete.php
+++ b/lib/Doctrine/Template/Listener/SoftDelete.php
@@ -24,12 +24,7 @@
  * sets a delete flag instead of actually deleting the record and all queries automatically
  * include a check for the deleted flag to exclude deleted records.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  * @author      Jonathan H. Wage <jonwage@gmail.com>
diff --git a/lib/Doctrine/Template/Listener/Timestampable.php b/lib/Doctrine/Template/Listener/Timestampable.php
index 685d772d3..fe0ea5ef7 100644
--- a/lib/Doctrine/Template/Listener/Timestampable.php
+++ b/lib/Doctrine/Template/Listener/Timestampable.php
@@ -23,12 +23,7 @@
  * Listener for the Timestampable behavior which automatically sets the created
  * and updated columns when a record is inserted and updated.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
@@ -105,9 +100,8 @@ public function preDqlUpdate(Doctrine_Event $event)
     /**
      * Gets the timestamp in the correct format based on the way the behavior is configured.
      *
-     * @param string                   $type
-     * @param Doctrine_Connection|null $conn
-     *
+     * @param  string                         $type
+     * @param  Doctrine_Connection|null       $conn
      * @return Doctrine_Expression|int|string
      */
     public function getTimestamp($type, $conn = null)
diff --git a/lib/Doctrine/Template/NestedSet.php b/lib/Doctrine/Template/NestedSet.php
index fa22d0c15..ee58cbb78 100644
--- a/lib/Doctrine/Template/NestedSet.php
+++ b/lib/Doctrine/Template/NestedSet.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine template which implements the custom NestedSet implementation.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @author      Roman Borschel <roman@code-factory.org>
  */
diff --git a/lib/Doctrine/Template/Searchable.php b/lib/Doctrine/Template/Searchable.php
index adc4e2c1d..f49df8f10 100644
--- a/lib/Doctrine/Template/Searchable.php
+++ b/lib/Doctrine/Template/Searchable.php
@@ -23,12 +23,8 @@
  * Doctrine_Template_Searchable.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
- * @version     $Revision$
  *
  * @see        www.doctrine-project.org
- * @since       1.0
  */
 class Doctrine_Template_Searchable extends Doctrine_Template
 {
@@ -79,10 +75,9 @@ public function batchUpdateIndexTableProxy($limit = null, $offset = null, $encod
     /**
      * Searchable keyword search proxy for Doctrine_Table.
      *
-     * @param string         $string Keyword string to search for
-     * @param Doctrine_Query $query  Query object to alter. Adds where condition to limit the results using the search index
-     *
-     * @return array ids and relevancy
+     * @param  string         $string Keyword string to search for
+     * @param  Doctrine_Query $query  Query object to alter. Adds where condition to limit the results using the search index
+     * @return array          ids and relevancy
      */
     public function searchTableProxy($string, $query = null)
     {
diff --git a/lib/Doctrine/Template/Sluggable.php b/lib/Doctrine/Template/Sluggable.php
index 4a7fc0620..1ebcc742c 100644
--- a/lib/Doctrine/Template/Sluggable.php
+++ b/lib/Doctrine/Template/Sluggable.php
@@ -24,12 +24,7 @@
  *
  * Easily create a slug for each record based on a specified set of fields
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
diff --git a/lib/Doctrine/Template/SoftDelete.php b/lib/Doctrine/Template/SoftDelete.php
index 2b1de3b7e..7ffa9b475 100644
--- a/lib/Doctrine/Template/SoftDelete.php
+++ b/lib/Doctrine/Template/SoftDelete.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Template_SoftDelete.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  * @author      Jonathan H. Wage <jonwage@gmail.com>
@@ -71,9 +66,8 @@ public function setTableDefinition()
     /**
      * Add a hardDelete() method to any of the models who act as SoftDelete behavior.
      *
-     * @param Doctrine_Connection $conn
-     *
-     * @return int $result number of affected rows
+     * @param  Doctrine_Connection $conn
+     * @return int                 $result number of affected rows
      */
     public function hardDelete($conn = null)
     {
diff --git a/lib/Doctrine/Template/Timestampable.php b/lib/Doctrine/Template/Timestampable.php
index 2ce89d006..13a6d08cf 100644
--- a/lib/Doctrine/Template/Timestampable.php
+++ b/lib/Doctrine/Template/Timestampable.php
@@ -25,12 +25,7 @@
  * Easily add created and updated at timestamps to your doctrine records that are automatically set
  * when records are saved
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
diff --git a/lib/Doctrine/Template/Versionable.php b/lib/Doctrine/Template/Versionable.php
index 8cf92d57c..32345597e 100644
--- a/lib/Doctrine/Template/Versionable.php
+++ b/lib/Doctrine/Template/Versionable.php
@@ -24,12 +24,7 @@
  *
  * Add revisioning/audit log to your models
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
@@ -91,10 +86,8 @@ public function getAuditLog()
      * reverts this record to given version, this method only works if versioning plugin
      * is enabled.
      *
-     * @param int $version an integer > 1
-     *
-     * @return Doctrine_Record this object
-     *
+     * @param  int                       $version an integer > 1
+     * @return Doctrine_Record           this object
      * @throws Doctrine_Record_Exception if given version does not exist
      */
     public function revert($version)
diff --git a/lib/Doctrine/Transaction.php b/lib/Doctrine/Transaction.php
index 086336561..e887c2ce9 100644
--- a/lib/Doctrine/Transaction.php
+++ b/lib/Doctrine/Transaction.php
@@ -25,12 +25,8 @@
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  * @author      Lukas Smith <smith@pooteeweet.org> (PEAR MDB2 library)
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7651 $
  */
 class Doctrine_Transaction extends Doctrine_Connection_Module
 {
@@ -91,8 +87,7 @@ class Doctrine_Transaction extends Doctrine_Connection_Module
      * of every collection Doctrine then takes a snapshot in order
      * to keep the collections up to date with the database
      *
-     * @param Doctrine_Collection $coll a collection to be added
-     *
+     * @param  Doctrine_Collection  $coll a collection to be added
      * @return Doctrine_Transaction this object
      */
     public function addCollection(Doctrine_Collection $coll)
@@ -179,10 +174,8 @@ public function getInternalTransactionLevel()
      *
      * Listeners: onPreTransactionBegin, onTransactionBegin
      *
-     * @param string $savepoint name of a savepoint to set
-     *
-     * @return int current transaction nesting level
-     *
+     * @param  string                         $savepoint name of a savepoint to set
+     * @return int                            current transaction nesting level
      * @throws Doctrine_Transaction_Exception if the transaction fails at database level
      */
     public function beginTransaction($savepoint = null)
@@ -230,10 +223,8 @@ public function beginTransaction($savepoint = null)
      *
      * Listeners: preTransactionCommit, postTransactionCommit
      *
-     * @param string $savepoint name of a savepoint to release
-     *
-     * @return bool false if commit couldn't be performed, true otherwise
-     *
+     * @param  string                         $savepoint name of a savepoint to release
+     * @return bool                           false if commit couldn't be performed, true otherwise
      * @throws Doctrine_Transaction_Exception if the transaction fails at database level
      * @throws Doctrine_Validator_Exception   if the transaction fails due to record validations
      */
@@ -306,10 +297,8 @@ public function commit($savepoint = null)
      * this method can be listened with onPreTransactionRollback and onTransactionRollback
      * eventlistener methods
      *
-     * @param string $savepoint name of a savepoint to rollback to
-     *
-     * @return bool false if rollback couldn't be performed, true otherwise
-     *
+     * @param  string                         $savepoint name of a savepoint to rollback to
+     * @return bool                           false if rollback couldn't be performed, true otherwise
      * @throws Doctrine_Transaction_Exception if the rollback operation fails at database level
      *
      * @todo Shouldnt this method only commit a rollback if the transactionLevel is 1
@@ -436,9 +425,8 @@ protected function _doBeginTransaction()
      * removes a savepoint from the internal savePoints array of this transaction object
      * and all its children savepoints.
      *
-     * @param sring $savepoint name of the savepoint to remove
-     *
-     * @return int removed savepoints
+     * @param  sring $savepoint name of the savepoint to remove
+     * @return int   removed savepoints
      */
     private function removeSavePoints($savepoint)
     {
@@ -479,7 +467,6 @@ private function removeSavePoints($savepoint)
      *                  READ COMMITTED (prevents dirty reads)
      *                  REPEATABLE READ (prevents nonrepeatable reads)
      *                  SERIALIZABLE (prevents phantom reads)
-     *
      * @throws Doctrine_Transaction_Exception if the feature is not supported by the driver
      * @throws PDOException                   if something fails at the PDO level
      */
@@ -496,8 +483,7 @@ public function setIsolation($isolation)
      * note: some drivers may support setting the transaction isolation level
      * but not fetching it
      *
-     * @return string returns the current session transaction isolation level
-     *
+     * @return string                         returns the current session transaction isolation level
      * @throws Doctrine_Transaction_Exception if the feature is not supported by the driver
      * @throws PDOException                   if something fails at the PDO level
      */
diff --git a/lib/Doctrine/Transaction/Exception.php b/lib/Doctrine/Transaction/Exception.php
index 04a953071..3440112e8 100644
--- a/lib/Doctrine/Transaction/Exception.php
+++ b/lib/Doctrine/Transaction/Exception.php
@@ -22,13 +22,8 @@
 /**
  * Doctrine_Transaction_Exception.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  *
- * @since       1.0
- *
- * @version     $Revision: 7490 $
- *
  * @see        www.doctrine-project.org
  */
 class Doctrine_Transaction_Exception extends Doctrine_Exception
diff --git a/lib/Doctrine/Transaction/Mock.php b/lib/Doctrine/Transaction/Mock.php
index 5928016c9..4c78d85d4 100644
--- a/lib/Doctrine/Transaction/Mock.php
+++ b/lib/Doctrine/Transaction/Mock.php
@@ -25,12 +25,8 @@
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  * @author      Lukas Smith <smith@pooteeweet.org> (PEAR MDB2 library)
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  */
 class Doctrine_Transaction_Mock extends Doctrine_Transaction
 {
diff --git a/lib/Doctrine/Transaction/Mssql.php b/lib/Doctrine/Transaction/Mssql.php
index a92b7105e..8f33683ec 100644
--- a/lib/Doctrine/Transaction/Mssql.php
+++ b/lib/Doctrine/Transaction/Mssql.php
@@ -22,12 +22,8 @@
 /**
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  * @author      Lukas Smith <smith@pooteeweet.org> (PEAR MDB2 library)
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7490 $
  */
 class Doctrine_Transaction_Mssql extends Doctrine_Transaction
 {
diff --git a/lib/Doctrine/Transaction/Mysql.php b/lib/Doctrine/Transaction/Mysql.php
index 227d2c18b..65f6bdc71 100644
--- a/lib/Doctrine/Transaction/Mysql.php
+++ b/lib/Doctrine/Transaction/Mysql.php
@@ -22,12 +22,8 @@
 /**
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  * @author      Lukas Smith <smith@pooteeweet.org> (PEAR MDB2 library)
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7490 $
  */
 class Doctrine_Transaction_Mysql extends Doctrine_Transaction
 {
@@ -78,7 +74,6 @@ protected function rollbackSavePoint($savepoint)
      *                  READ COMMITTED (prevents dirty reads)
      *                  REPEATABLE READ (prevents nonrepeatable reads)
      *                  SERIALIZABLE (prevents phantom reads)
-     *
      * @throws Doctrine_Transaction_Exception if using unknown isolation level
      * @throws PDOException                   if something fails at the PDO level
      */
diff --git a/lib/Doctrine/Transaction/Oracle.php b/lib/Doctrine/Transaction/Oracle.php
index feb1a9d28..8c39112aa 100644
--- a/lib/Doctrine/Transaction/Oracle.php
+++ b/lib/Doctrine/Transaction/Oracle.php
@@ -22,12 +22,8 @@
 /**
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  * @author      Lukas Smith <smith@pooteeweet.org> (PEAR MDB2 library)
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7490 $
  */
 class Doctrine_Transaction_Oracle extends Doctrine_Transaction
 {
@@ -77,7 +73,6 @@ protected function rollbackSavePoint($savepoint)
      *                  READ COMMITTED (prevents dirty reads)
      *                  REPEATABLE READ (prevents nonrepeatable reads)
      *                  SERIALIZABLE (prevents phantom reads)
-     *
      * @throws PDOException                   if something fails at the PDO level
      * @throws Doctrine_Transaction_Exception if using unknown isolation level
      */
diff --git a/lib/Doctrine/Transaction/Pgsql.php b/lib/Doctrine/Transaction/Pgsql.php
index bbb900e1b..ba526baed 100644
--- a/lib/Doctrine/Transaction/Pgsql.php
+++ b/lib/Doctrine/Transaction/Pgsql.php
@@ -23,12 +23,8 @@
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  * @author      Paul Cooper <pgc@ucecom.com> (PEAR MDB2 Pgsql driver)
  * @author      Lukas Smith <smith@pooteeweet.org> (PEAR MDB2 library)
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7490 $
  */
 class Doctrine_Transaction_Pgsql extends Doctrine_Transaction
 {
@@ -79,7 +75,6 @@ protected function rollbackSavePoint($savepoint)
      *                  READ COMMITTED (prevents dirty reads)
      *                  REPEATABLE READ (prevents nonrepeatable reads)
      *                  SERIALIZABLE (prevents phantom reads)
-     *
      * @throws PDOException                   if something fails at the PDO level
      * @throws Doctrine_Transaction_Exception if using unknown isolation level or unknown wait option
      */
diff --git a/lib/Doctrine/Transaction/Sqlite.php b/lib/Doctrine/Transaction/Sqlite.php
index 3d312c33f..929b2c24d 100644
--- a/lib/Doctrine/Transaction/Sqlite.php
+++ b/lib/Doctrine/Transaction/Sqlite.php
@@ -22,12 +22,8 @@
 /**
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  * @author      Lukas Smith <smith@pooteeweet.org> (PEAR MDB2 library)
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7490 $
  */
 class Doctrine_Transaction_Sqlite extends Doctrine_Transaction
 {
@@ -39,7 +35,6 @@ class Doctrine_Transaction_Sqlite extends Doctrine_Transaction
      *                  READ COMMITTED (prevents dirty reads)
      *                  REPEATABLE READ (prevents nonrepeatable reads)
      *                  SERIALIZABLE (prevents phantom reads)
-     *
      * @throws PDOException                   if something fails at the PDO level
      * @throws Doctrine_Transaction_Exception if using unknown isolation level
      */
diff --git a/lib/Doctrine/Tree.php b/lib/Doctrine/Tree.php
index 4f53b64ba..7342ed9ad 100644
--- a/lib/Doctrine/Tree.php
+++ b/lib/Doctrine/Tree.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Tree.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7490 $
  *
  * @author      Joe Simms <joe.simms@websites4.com>
  */
@@ -90,11 +85,9 @@ public function setUp()
      * This is a factory method that returns a tree instance based upon
      * chosen implementation.
      *
-     * @param object $table   instance of Doctrine_Table
-     * @param array  $options options
-     *
+     * @param  object             $table   instance of Doctrine_Table
+     * @param  array              $options options
      * @return Doctrine_Tree
-     *
      * @throws Doctrine_Exception if class $implName does not extend Doctrine_Tree
      */
     public static function factory(Doctrine_Table $table, $implName, $options = array())
diff --git a/lib/Doctrine/Tree/AdjacencyList.php b/lib/Doctrine/Tree/AdjacencyList.php
index 6c80e0459..bd2a1fc8e 100644
--- a/lib/Doctrine/Tree/AdjacencyList.php
+++ b/lib/Doctrine/Tree/AdjacencyList.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Tree_AdjacencyList.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7490 $
  *
  * @author      Joe Simms <joe.simms@websites4.com>
  */
diff --git a/lib/Doctrine/Tree/Exception.php b/lib/Doctrine/Tree/Exception.php
index 6c76d2fc6..105233dc8 100644
--- a/lib/Doctrine/Tree/Exception.php
+++ b/lib/Doctrine/Tree/Exception.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Tree_Exception.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7490 $
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
diff --git a/lib/Doctrine/Tree/Interface.php b/lib/Doctrine/Tree/Interface.php
index f448850b4..eb5d59cd0 100644
--- a/lib/Doctrine/Tree/Interface.php
+++ b/lib/Doctrine/Tree/Interface.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Tree_Interface.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7490 $
  *
  * @author      Joe Simms <joe.simms@websites4.com>
  */
@@ -50,21 +45,19 @@ public function fetchRoot($root_id = 1);
     /**
      * optimised method to returns iterator for traversal of the entire tree from root.
      *
-     * @param array      $options       options
-     * @param mixed|null $hydrationMode
-     *
-     * @return Iterator instance of Doctrine_Node_<Implementation>_PreOrderIterator
+     * @param  array      $options       options
+     * @param  mixed|null $hydrationMode
+     * @return Iterator   instance of Doctrine_Node_<Implementation>_PreOrderIterator
      */
     public function fetchTree($options = array(), $hydrationMode = null);
 
     /**
      * optimised method that returns iterator for traversal of the tree from the given record primary key.
      *
-     * @param mixed      $pk            primary key as used by table::find() to locate node to traverse tree from
-     * @param array      $options       options
-     * @param mixed|null $hydrationMode
-     *
-     * @return iterator instance of Doctrine_Node_<Implementation>_PreOrderIterator
+     * @param  mixed      $pk            primary key as used by table::find() to locate node to traverse tree from
+     * @param  array      $options       options
+     * @param  mixed|null $hydrationMode
+     * @return iterator   instance of Doctrine_Node_<Implementation>_PreOrderIterator
      */
     public function fetchBranch($pk, $options = array(), $hydrationMode = null);
 }
diff --git a/lib/Doctrine/Tree/MaterializedPath.php b/lib/Doctrine/Tree/MaterializedPath.php
index babaa0583..12aea575d 100644
--- a/lib/Doctrine/Tree/MaterializedPath.php
+++ b/lib/Doctrine/Tree/MaterializedPath.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Tree_MaterializedPath.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7490 $
  *
  * @author      Joe Simms <joe.simms@websites4.com>
  */
diff --git a/lib/Doctrine/Tree/NestedSet.php b/lib/Doctrine/Tree/NestedSet.php
index f595b97b6..dd9fbfb8a 100644
--- a/lib/Doctrine/Tree/NestedSet.php
+++ b/lib/Doctrine/Tree/NestedSet.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Tree_NestedSet.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7490 $
  *
  * @author      Joe Simms <joe.simms@websites4.com>
  * @author      Roman Borschel <roman@code-factory.org>
@@ -149,10 +144,9 @@ public function fetchRoot($rootId = 1)
     /**
      * Fetches a tree.
      *
-     * @param array      $options       Options
-     * @param mixed|null $hydrationMode
-     *
-     * @return mixed the tree or FALSE if the tree could not be found
+     * @param  array      $options       Options
+     * @param  mixed|null $hydrationMode
+     * @return mixed      the tree or FALSE if the tree could not be found
      */
     public function fetchTree($options = array(), $hydrationMode = null)
     {
@@ -190,11 +184,10 @@ public function fetchTree($options = array(), $hydrationMode = null)
     /**
      * Fetches a branch of a tree.
      *
-     * @param mixed      $pk            primary key as used by table::find() to locate node to traverse tree from
-     * @param array      $options       options
-     * @param mixed|null $hydrationMode
-     *
-     * @return mixed the branch or FALSE if the branch could not be found
+     * @param  mixed      $pk            primary key as used by table::find() to locate node to traverse tree from
+     * @param  array      $options       options
+     * @param  mixed|null $hydrationMode
+     * @return mixed      the branch or FALSE if the branch could not be found
      *
      * @todo Only fetch the lft and rgt values of the initial record. more is not needed.
      */
@@ -240,8 +233,7 @@ public function fetchRoots()
     /**
      * returns parsed query with root id where clause added if applicable.
      *
-     * @param object $query Doctrine_Query
-     *
+     * @param  object         $query Doctrine_Query
      * @return Doctrine_Query
      */
     public function returnQueryWithRootId($query, $rootId = 1)
diff --git a/lib/Doctrine/Util.php b/lib/Doctrine/Util.php
index d4ecd63c8..d8491e03e 100644
--- a/lib/Doctrine/Util.php
+++ b/lib/Doctrine/Util.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Util.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
diff --git a/lib/Doctrine/Validator.php b/lib/Doctrine/Validator.php
index 903ce771c..181a6a3e2 100644
--- a/lib/Doctrine/Validator.php
+++ b/lib/Doctrine/Validator.php
@@ -22,12 +22,7 @@
 /**
  * This class is responsible for performing all validations on record properties.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7490 $
  *
  * @author      Roman Borschel <roman@code-factory.org>
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
@@ -42,8 +37,7 @@ class Doctrine_Validator extends Doctrine_Locator_Injectable
     /**
      * Get a validator instance for the passed $name.
      *
-     * @param string $name Name of the validator or the validator class name
-     *
+     * @param  string                       $name Name of the validator or the validator class name
      * @return Doctrine_Validator_Interface $validator
      */
     public static function getValidator($name)
@@ -81,11 +75,10 @@ public function validateRecord(Doctrine_Record $record)
     /**
      * Validates the length of a field.
      *
-     * @param string $value         Value to validate
-     * @param string $type          Type of field being validated
-     * @param string $maximumLength Maximum length allowed for the column
-     *
-     * @return bool $success       True/false for whether the value passed validation
+     * @param  string $value         Value to validate
+     * @param  string $type          Type of field being validated
+     * @param  string $maximumLength Maximum length allowed for the column
+     * @return bool   $success       True/false for whether the value passed validation
      */
     public static function validateLength($value, $type, $maximumLength)
     {
@@ -121,9 +114,8 @@ public static function validateLength($value, $type, $maximumLength)
     /**
      * Get length of passed string. Will use multibyte character functions if they exist.
      *
-     * @param string $string
-     *
-     * @return int $length
+     * @param  string $string
+     * @return int    $length
      */
     public static function getStringLength($string)
     {
@@ -147,9 +139,8 @@ public function hasErrors()
     /**
      * Validate the type of the passed variable.
      *
-     * @param mixed  $var  Variable to validate
-     * @param string $type Type of the variable expected
-     *
+     * @param  mixed  $var  Variable to validate
+     * @param  string $type Type of the variable expected
      * @return bool
      */
     public static function isValidType($var, $type)
diff --git a/lib/Doctrine/Validator/Country.php b/lib/Doctrine/Validator/Country.php
index 01146d536..ddb54a43a 100644
--- a/lib/Doctrine/Validator/Country.php
+++ b/lib/Doctrine/Validator/Country.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Validator_Country.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7490 $
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
diff --git a/lib/Doctrine/Validator/Creditcard.php b/lib/Doctrine/Validator/Creditcard.php
index 00c59813e..d26a591e4 100644
--- a/lib/Doctrine/Validator/Creditcard.php
+++ b/lib/Doctrine/Validator/Creditcard.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Validator_Creditcard.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7490 $
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
diff --git a/lib/Doctrine/Validator/Date.php b/lib/Doctrine/Validator/Date.php
index a2f653842..850cc3766 100644
--- a/lib/Doctrine/Validator/Date.php
+++ b/lib/Doctrine/Validator/Date.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Validator_Date.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7490 $
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
diff --git a/lib/Doctrine/Validator/Driver.php b/lib/Doctrine/Validator/Driver.php
index 34a28bf04..cb73411ad 100644
--- a/lib/Doctrine/Validator/Driver.php
+++ b/lib/Doctrine/Validator/Driver.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Validator_Driver.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 1080 $
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
@@ -68,9 +63,8 @@ public function __isset($arg)
     /**
      * sets given value to an argument.
      *
-     * @param $arg   the name of the option to be changed
-     * @param $value the value of the option
-     *
+     * @param                            $arg   the name of the option to be changed
+     * @param                            $value the value of the option
      * @return Doctrine_Validator_Driver this object
      */
     public function __set($arg, $value)
@@ -83,8 +77,7 @@ public function __set($arg, $value)
     /**
      * returns the value of an argument.
      *
-     * @param $arg the name of the option to retrieve
-     *
+     * @param        $arg the name of the option to retrieve
      * @return mixed the value of the option
      */
     public function getArg($arg)
@@ -99,9 +92,8 @@ public function getArg($arg)
     /**
      * sets given value to an argument.
      *
-     * @param $arg   the name of the option to be changed
-     * @param $value the value of the option
-     *
+     * @param                            $arg   the name of the option to be changed
+     * @param                            $value the value of the option
      * @return Doctrine_Validator_Driver this object
      */
     public function setArg($arg, $value)
diff --git a/lib/Doctrine/Validator/Email.php b/lib/Doctrine/Validator/Email.php
index e35ba304d..daf91eb48 100644
--- a/lib/Doctrine/Validator/Email.php
+++ b/lib/Doctrine/Validator/Email.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Validator_Email.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7490 $
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
@@ -89,8 +84,7 @@ public function validate($value)
     /**
      * Check DNS Records for MX type.
      *
-     * @param string $host Host name
-     *
+     * @param  string $host Host name
      * @return bool
      */
     private function _checkMX($host)
diff --git a/lib/Doctrine/Validator/ErrorStack.php b/lib/Doctrine/Validator/ErrorStack.php
index 662e5fdaa..d7d92a81d 100644
--- a/lib/Doctrine/Validator/ErrorStack.php
+++ b/lib/Doctrine/Validator/ErrorStack.php
@@ -24,12 +24,8 @@
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  * @author      Roman Borschel <roman@code-factory.org>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7490 $
  */
 class Doctrine_Validator_ErrorStack extends Doctrine_Access implements Countable, IteratorAggregate
 {
@@ -65,9 +61,8 @@ public function __construct($className)
     /**
      * Adds an error to the stack.
      *
-     * @param string                           $invalidFieldName
-     * @param string|Doctrine_Validator_Driver $errorCode
-     *
+     * @param  string                           $invalidFieldName
+     * @param  string|Doctrine_Validator_Driver $errorCode
      * @throws Doctrine_Exception
      */
     public function add($invalidFieldName, $errorCode = 'general')
@@ -123,8 +118,7 @@ public function set($fieldName, $errorCode)
     /**
      * Check if a field has an error.
      *
-     * @param string $fieldName
-     *
+     * @param  string $fieldName
      * @return bool
      */
     public function contains($fieldName)
diff --git a/lib/Doctrine/Validator/Exception.php b/lib/Doctrine/Validator/Exception.php
index f6db1eb19..6242c18bd 100644
--- a/lib/Doctrine/Validator/Exception.php
+++ b/lib/Doctrine/Validator/Exception.php
@@ -23,12 +23,8 @@
  * Doctrine_Validator_Exception.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7490 $
  */
 class Doctrine_Validator_Exception extends Doctrine_Exception implements Countable, IteratorAggregate
 {
diff --git a/lib/Doctrine/Validator/Future.php b/lib/Doctrine/Validator/Future.php
index 39b7080d3..49d540a2b 100644
--- a/lib/Doctrine/Validator/Future.php
+++ b/lib/Doctrine/Validator/Future.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Validator_Future.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @author      Roman Borschel <roman@code-factory.org>
  */
diff --git a/lib/Doctrine/Validator/HtmlColor.php b/lib/Doctrine/Validator/HtmlColor.php
index ac4651669..2a462d887 100644
--- a/lib/Doctrine/Validator/HtmlColor.php
+++ b/lib/Doctrine/Validator/HtmlColor.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Validator_HtmlColor.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7490 $
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
diff --git a/lib/Doctrine/Validator/Ip.php b/lib/Doctrine/Validator/Ip.php
index 6198ce2a5..8be8b12e0 100644
--- a/lib/Doctrine/Validator/Ip.php
+++ b/lib/Doctrine/Validator/Ip.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Validator_Ip.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7490 $
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
diff --git a/lib/Doctrine/Validator/Minlength.php b/lib/Doctrine/Validator/Minlength.php
index e68c8ebb3..3ae5513a5 100644
--- a/lib/Doctrine/Validator/Minlength.php
+++ b/lib/Doctrine/Validator/Minlength.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Validator_Regexp.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7490 $
  *
  * @author      Gijs van Dulmen <gijs@vandulmen.net>
  */
diff --git a/lib/Doctrine/Validator/Nospace.php b/lib/Doctrine/Validator/Nospace.php
index c3032d1fa..bc34c5fe5 100644
--- a/lib/Doctrine/Validator/Nospace.php
+++ b/lib/Doctrine/Validator/Nospace.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Validator_Nospace.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7490 $
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
diff --git a/lib/Doctrine/Validator/Notblank.php b/lib/Doctrine/Validator/Notblank.php
index ee9d37071..1f4d0119c 100644
--- a/lib/Doctrine/Validator/Notblank.php
+++ b/lib/Doctrine/Validator/Notblank.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Validator_Notblank.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7490 $
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
diff --git a/lib/Doctrine/Validator/Notnull.php b/lib/Doctrine/Validator/Notnull.php
index 7a2804180..8effc8c68 100644
--- a/lib/Doctrine/Validator/Notnull.php
+++ b/lib/Doctrine/Validator/Notnull.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Validator_Notnull.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7490 $
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
diff --git a/lib/Doctrine/Validator/Past.php b/lib/Doctrine/Validator/Past.php
index a3798eb96..42756671c 100644
--- a/lib/Doctrine/Validator/Past.php
+++ b/lib/Doctrine/Validator/Past.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Validator_Past.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @author      Roman Borschel <roman@code-factory.org>
  */
diff --git a/lib/Doctrine/Validator/Range.php b/lib/Doctrine/Validator/Range.php
index 79b229955..bf5dcb9e3 100644
--- a/lib/Doctrine/Validator/Range.php
+++ b/lib/Doctrine/Validator/Range.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Validator_Range.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7490 $
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
diff --git a/lib/Doctrine/Validator/Readonly.php b/lib/Doctrine/Validator/Readonly.php
index f0977407f..9bd1f02c6 100755
--- a/lib/Doctrine/Validator/Readonly.php
+++ b/lib/Doctrine/Validator/Readonly.php
@@ -20,8 +20,6 @@
 /**
  * Doctrine_Validator_Readonly.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
  *
  * @author      Adam Huttler <ahuttler@geminisbs.com>
diff --git a/lib/Doctrine/Validator/Regexp.php b/lib/Doctrine/Validator/Regexp.php
index 3ccfe5094..6e2422b52 100644
--- a/lib/Doctrine/Validator/Regexp.php
+++ b/lib/Doctrine/Validator/Regexp.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Validator_Regexp.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7490 $
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
diff --git a/lib/Doctrine/Validator/Time.php b/lib/Doctrine/Validator/Time.php
index 2bb100ae5..4b9021722 100644
--- a/lib/Doctrine/Validator/Time.php
+++ b/lib/Doctrine/Validator/Time.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Validator_Time.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 3884 $
  *
  * @author      Mark Pearson <mark.pearson0@googlemail.com>
  */
diff --git a/lib/Doctrine/Validator/Timestamp.php b/lib/Doctrine/Validator/Timestamp.php
index 03c426ad9..3adf6224a 100644
--- a/lib/Doctrine/Validator/Timestamp.php
+++ b/lib/Doctrine/Validator/Timestamp.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Validator_Timestamp.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 3884 $
  *
  * @author      Mark Pearson <mark.pearson0@googlemail.com>
  */
diff --git a/lib/Doctrine/Validator/Unique.php b/lib/Doctrine/Validator/Unique.php
index cb2734d6d..681fe384a 100644
--- a/lib/Doctrine/Validator/Unique.php
+++ b/lib/Doctrine/Validator/Unique.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Validator_Unique.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7490 $
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
diff --git a/lib/Doctrine/Validator/Unsigned.php b/lib/Doctrine/Validator/Unsigned.php
index 4f05af54c..6d832c437 100644
--- a/lib/Doctrine/Validator/Unsigned.php
+++ b/lib/Doctrine/Validator/Unsigned.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Validator_Unsigned.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 1080 $
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
diff --git a/lib/Doctrine/Validator/Usstate.php b/lib/Doctrine/Validator/Usstate.php
index 1a1ce4656..f5c274e52 100644
--- a/lib/Doctrine/Validator/Usstate.php
+++ b/lib/Doctrine/Validator/Usstate.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Validator_Usstate.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7490 $
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
diff --git a/lib/Doctrine/View.php b/lib/Doctrine/View.php
index a4655cef2..afe7d99bb 100644
--- a/lib/Doctrine/View.php
+++ b/lib/Doctrine/View.php
@@ -25,12 +25,8 @@
  * this class represents a database view
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7490 $
  */
 class Doctrine_View
 {
diff --git a/lib/Doctrine/View/Exception.php b/lib/Doctrine/View/Exception.php
index 0dbd77364..88e94eaf5 100644
--- a/lib/Doctrine/View/Exception.php
+++ b/lib/Doctrine/View/Exception.php
@@ -23,12 +23,8 @@
  * Doctrine_View_Exception.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7490 $
  */
 class Doctrine_View_Exception extends Doctrine_Exception
 {
diff --git a/tests/AccessTestCase.php b/tests/AccessTestCase.php
index 77979ef14..7cc6009c1 100644
--- a/tests/AccessTestCase.php
+++ b/tests/AccessTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Access_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/AuditLogTestCase.php b/tests/AuditLogTestCase.php
index 42411ceb5..154e240b9 100644
--- a/tests/AuditLogTestCase.php
+++ b/tests/AuditLogTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_AuditLog_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/BaseTestCase.php b/tests/BaseTestCase.php
index a7f6f4bed..e1aba889b 100644
--- a/tests/BaseTestCase.php
+++ b/tests/BaseTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Base_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/BatchIteratorTestCase.php b/tests/BatchIteratorTestCase.php
index b8c5bb96c..8ab997584 100644
--- a/tests/BatchIteratorTestCase.php
+++ b/tests/BatchIteratorTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_BatchIterator_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Cache/AbstractTestCase.php b/tests/Cache/AbstractTestCase.php
index f2f3590cf..ad41049ae 100644
--- a/tests/Cache/AbstractTestCase.php
+++ b/tests/Cache/AbstractTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Cache_Abstract_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 7490 $
  */
 abstract class Doctrine_Cache_Abstract_TestCase extends Doctrine_UnitTestCase
 {
diff --git a/tests/Cache/ApcTestCase.php b/tests/Cache/ApcTestCase.php
index cce1b7168..2325c67c1 100644
--- a/tests/Cache/ApcTestCase.php
+++ b/tests/Cache/ApcTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Cache_Apc_TestCase.
  *
  * @author      David Abdemoulaie <dave@hobodave.com>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.2
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Cache/ArrayTestCase.php b/tests/Cache/ArrayTestCase.php
index aa4a62c09..583ef1397 100644
--- a/tests/Cache/ArrayTestCase.php
+++ b/tests/Cache/ArrayTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Cache_Array_TestCase.
  *
  * @author      David Abdemoulaie <dave@hobodave.com>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.2
- *
- * @version     $Revision: 7490 $
  *
  * @internal
  *
diff --git a/tests/Cache/DbTestCase.php b/tests/Cache/DbTestCase.php
index d54d237da..3a9003adc 100644
--- a/tests/Cache/DbTestCase.php
+++ b/tests/Cache/DbTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Cache_Db_TestCase.
  *
  * @author      David Abdemoulaie <dave@hobodave.com>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.2
- *
- * @version     $Revision: 7490 $
  *
  * @internal
  *
diff --git a/tests/Cache/MemcacheTestCase.php b/tests/Cache/MemcacheTestCase.php
index 404de9806..b18da692b 100644
--- a/tests/Cache/MemcacheTestCase.php
+++ b/tests/Cache/MemcacheTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Cache_Memcache_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Cache/Query/SqliteTestCase.php b/tests/Cache/Query/SqliteTestCase.php
index 1ef5a1d28..0920ae1ae 100644
--- a/tests/Cache/Query/SqliteTestCase.php
+++ b/tests/Cache/Query/SqliteTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Cache_Query_Sqlite_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Cache/SqliteTestCase.php b/tests/Cache/SqliteTestCase.php
index 53c77091c..b7d2385c5 100644
--- a/tests/Cache/SqliteTestCase.php
+++ b/tests/Cache/SqliteTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Cache_Sqlite_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Cache/XcacheTestCase.php b/tests/Cache/XcacheTestCase.php
index f2da2f42e..086189872 100644
--- a/tests/Cache/XcacheTestCase.php
+++ b/tests/Cache/XcacheTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Cache_Xcache_TestCase.
  *
  * @author      David Abdemoulaie <dave@hobodave.com>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.2
- *
- * @version     $Revision: 7490 $
  *
  * @internal
  *
diff --git a/tests/ClassTableInheritanceTestCase.php b/tests/ClassTableInheritanceTestCase.php
index 038b25909..b88ec3946 100644
--- a/tests/ClassTableInheritanceTestCase.php
+++ b/tests/ClassTableInheritanceTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_ClassTableInheritance_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/CliTestCase.php b/tests/CliTestCase.php
index fc7daa940..750d9ec45 100644
--- a/tests/CliTestCase.php
+++ b/tests/CliTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Cli_TestCase.
  *
  * @author      Dan Bettles <danbettles@yahoo.co.uk>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Collection/SnapshotTestCase.php b/tests/Collection/SnapshotTestCase.php
index ae3878855..e0910b140 100644
--- a/tests/Collection/SnapshotTestCase.php
+++ b/tests/Collection/SnapshotTestCase.php
@@ -29,14 +29,10 @@
  * state of the collection.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/CollectionTestCase.php b/tests/CollectionTestCase.php
index 5224cb4cf..36c1d5582 100644
--- a/tests/CollectionTestCase.php
+++ b/tests/CollectionTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Collection_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/ColumnAggregationInheritanceTestCase.php b/tests/ColumnAggregationInheritanceTestCase.php
index b628a617d..31adf8407 100644
--- a/tests/ColumnAggregationInheritanceTestCase.php
+++ b/tests/ColumnAggregationInheritanceTestCase.php
@@ -24,14 +24,10 @@
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  * @author      Bjarte Stien Karlsen <bjartka@pvv.ntnu.no>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/ColumnAliasTestCase.php b/tests/ColumnAliasTestCase.php
index 76ae39e8f..b5fa2dec1 100644
--- a/tests/ColumnAliasTestCase.php
+++ b/tests/ColumnAliasTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_ColumnAlias_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/ConcreteInheritanceTestCase.php b/tests/ConcreteInheritanceTestCase.php
index 04a5c0a17..bc02b280d 100644
--- a/tests/ConcreteInheritanceTestCase.php
+++ b/tests/ConcreteInheritanceTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_ConcreteInheritance_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Connection/CustomTestCase.php b/tests/Connection/CustomTestCase.php
index c8c2c1572..ab6ed8cf3 100644
--- a/tests/Connection/CustomTestCase.php
+++ b/tests/Connection/CustomTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Connection_Custom_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Connection/MssqlTestCase.php b/tests/Connection/MssqlTestCase.php
index 464ea7add..03083dbd8 100644
--- a/tests/Connection/MssqlTestCase.php
+++ b/tests/Connection/MssqlTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Connection_Mssql_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Connection/MysqlTestCase.php b/tests/Connection/MysqlTestCase.php
index 18dade069..00adc22ec 100644
--- a/tests/Connection/MysqlTestCase.php
+++ b/tests/Connection/MysqlTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Connection_Mysql_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Connection/OracleTestCase.php b/tests/Connection/OracleTestCase.php
index 258198dee..6658eeb16 100644
--- a/tests/Connection/OracleTestCase.php
+++ b/tests/Connection/OracleTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Connection_Oracle_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Connection/PgsqlTestCase.php b/tests/Connection/PgsqlTestCase.php
index 8c203db48..54054abf6 100644
--- a/tests/Connection/PgsqlTestCase.php
+++ b/tests/Connection/PgsqlTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Connection_Pgsql_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Connection/ProfilerTestCase.php b/tests/Connection/ProfilerTestCase.php
index 9ca0ace1d..33c1b6272 100644
--- a/tests/Connection/ProfilerTestCase.php
+++ b/tests/Connection/ProfilerTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Connection_Profiler_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Connection/SqliteTestCase.php b/tests/Connection/SqliteTestCase.php
index ddc378217..7a3004d0c 100644
--- a/tests/Connection/SqliteTestCase.php
+++ b/tests/Connection/SqliteTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Connection_Sqlite_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Connection/UnitOfWork.php b/tests/Connection/UnitOfWork.php
index 8770ef861..4d1aa8874 100644
--- a/tests/Connection/UnitOfWork.php
+++ b/tests/Connection/UnitOfWork.php
@@ -23,14 +23,10 @@
  * Doctrine_Connection_UnitOfWork_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/ConnectionTestCase.php b/tests/ConnectionTestCase.php
index 5bf6ef5c1..8589dd88f 100644
--- a/tests/ConnectionTestCase.php
+++ b/tests/ConnectionTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Connection_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/CtiColumnAggregationInheritanceTestCase.php b/tests/CtiColumnAggregationInheritanceTestCase.php
index 93b498372..3ea316e03 100644
--- a/tests/CtiColumnAggregationInheritanceTestCase.php
+++ b/tests/CtiColumnAggregationInheritanceTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_CtiColumnAggregation_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/CustomPrimaryKeyTestCase.php b/tests/CustomPrimaryKeyTestCase.php
index 0e8aacf76..d4a84fa38 100644
--- a/tests/CustomPrimaryKeyTestCase.php
+++ b/tests/CustomPrimaryKeyTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_CustomPrimaryKey_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/CustomResultSetOrderTestCase.php b/tests/CustomResultSetOrderTestCase.php
index 2ecbb221e..4215e81c9 100644
--- a/tests/CustomResultSetOrderTestCase.php
+++ b/tests/CustomResultSetOrderTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_CustomResultSetOrder_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/DBTestCase.php b/tests/DBTestCase.php
index 489426918..945caebbc 100644
--- a/tests/DBTestCase.php
+++ b/tests/DBTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Db_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Data/ExportTestCase.php b/tests/Data/ExportTestCase.php
index af4b96ef9..67899b2b4 100644
--- a/tests/Data/ExportTestCase.php
+++ b/tests/Data/ExportTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Data_Export_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Data/ImportTestCase.php b/tests/Data/ImportTestCase.php
index 994691de6..4d2493c51 100644
--- a/tests/Data/ImportTestCase.php
+++ b/tests/Data/ImportTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Data_Import_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/DataDict/MssqlTestCase.php b/tests/DataDict/MssqlTestCase.php
index 4413592db..884bdf5ed 100644
--- a/tests/DataDict/MssqlTestCase.php
+++ b/tests/DataDict/MssqlTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_DataDict_Mysql_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/DataDict/MysqlTestCase.php b/tests/DataDict/MysqlTestCase.php
index 6f039efda..0f5c9f9b8 100644
--- a/tests/DataDict/MysqlTestCase.php
+++ b/tests/DataDict/MysqlTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_DataDict_Mysql_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/DataDict/OracleTestCase.php b/tests/DataDict/OracleTestCase.php
index b8216d21d..b6eb06efd 100644
--- a/tests/DataDict/OracleTestCase.php
+++ b/tests/DataDict/OracleTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_DataDict_Oracle_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/DataDict/PgsqlTestCase.php b/tests/DataDict/PgsqlTestCase.php
index 7c452ca13..a99b25281 100644
--- a/tests/DataDict/PgsqlTestCase.php
+++ b/tests/DataDict/PgsqlTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_DataDict_Oracle_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/DataDict/SqliteTestCase.php b/tests/DataDict/SqliteTestCase.php
index a14c2d9dd..58bd4557f 100644
--- a/tests/DataDict/SqliteTestCase.php
+++ b/tests/DataDict/SqliteTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_DataDict_Sqlite_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/DataDictTestCase.php b/tests/DataDictTestCase.php
index 8aa914780..d4eb3dfd2 100644
--- a/tests/DataDictTestCase.php
+++ b/tests/DataDictTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_DataDict_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/DataType/BooleanTestCase.php b/tests/DataType/BooleanTestCase.php
index 821e34ab9..df03da0fd 100644
--- a/tests/DataType/BooleanTestCase.php
+++ b/tests/DataType/BooleanTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_DataType_Boolean_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/DataType/EnumTestCase.php b/tests/DataType/EnumTestCase.php
index 596d137dd..54d9a0d02 100644
--- a/tests/DataType/EnumTestCase.php
+++ b/tests/DataType/EnumTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_DataType_Enum_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Db/ProfilerTestCase.php b/tests/Db/ProfilerTestCase.php
index 7ed64ce43..06766ce62 100644
--- a/tests/Db/ProfilerTestCase.php
+++ b/tests/Db/ProfilerTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Connection_Profiler_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/DoctrineTest.php b/tests/DoctrineTest.php
index 4fd392993..a208afae6 100644
--- a/tests/DoctrineTest.php
+++ b/tests/DoctrineTest.php
@@ -24,14 +24,10 @@
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  * @author      Bjarte S. Karlsen <bjartka@pvv.ntnu.no>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  */
 
 require_once dirname(__FILE__).'/DoctrineTest/UnitTestCase.php';
@@ -218,8 +214,7 @@ public function requireModels()
     /**
      * Parse Options from cli into an associative array.
      *
-     * @param array $array An argv array from cli
-     *
+     * @param  array $array An argv array from cli
      * @return array An array with options
      */
     public function parseOptions($array)
@@ -250,9 +245,8 @@ public function parseOptions($array)
      *
      * Will create test case if it does not exist
      *
-     * @param string $class The name of the class to autoload
-     *
-     * @return bool True
+     * @param  string $class The name of the class to autoload
+     * @return bool   True
      */
     public static function autoload($class)
     {
diff --git a/tests/DoctrineTest/Coverage.php b/tests/DoctrineTest/Coverage.php
index e44a2a690..3799ebabc 100644
--- a/tests/DoctrineTest/Coverage.php
+++ b/tests/DoctrineTest/Coverage.php
@@ -24,14 +24,10 @@
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  * @author      Bjarte S. Karlsen <bjartka@pvv.ntnu.no>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  */
 class DoctrineTest_Coverage
 {
@@ -186,8 +182,7 @@ public function generateReport()
      * This method simply removes the Doctrine Path and raplces _ with / and
      * removes .php to get the classname for a file
      *
-     * @param string $fileName The name of the file
-     *
+     * @param  string $fileName The name of the file
      * @return string The name of the class
      */
     public function getClassNameFromFileName($fileName)
@@ -215,9 +210,8 @@ public function calculateTotalPercentage()
      * This method will simply check if the method has no lines that should be
      * tested or not. Then it will return data to be stored for later use.
      *
-     * @param string $class The name of a class
-     *
-     * @return array An associative array with coverage information
+     * @param  string $class The name of a class
+     * @return array  An associative array with coverage information
      */
     public function generateCoverageInfoNotCoveredFile($class)
     {
diff --git a/tests/DoctrineTest/Doctrine_UnitTestCase.php b/tests/DoctrineTest/Doctrine_UnitTestCase.php
index baf1dd458..de265e1b8 100644
--- a/tests/DoctrineTest/Doctrine_UnitTestCase.php
+++ b/tests/DoctrineTest/Doctrine_UnitTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_UnitTestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/EventListener/ChainTestCase.php b/tests/EventListener/ChainTestCase.php
index dea8aa9e8..70b42cd46 100644
--- a/tests/EventListener/ChainTestCase.php
+++ b/tests/EventListener/ChainTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_EventListener_Chain_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/EventListenerTestCase.php b/tests/EventListenerTestCase.php
index d787af0a6..2dc89578f 100644
--- a/tests/EventListenerTestCase.php
+++ b/tests/EventListenerTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_EventListener_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Export/CheckConstraintTestCase.php b/tests/Export/CheckConstraintTestCase.php
index c1294fc94..d6f508057 100644
--- a/tests/Export/CheckConstraintTestCase.php
+++ b/tests/Export/CheckConstraintTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Export_CheckConstraint_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Export/MssqlTestCase.php b/tests/Export/MssqlTestCase.php
index 3bedd8574..c27f07315 100644
--- a/tests/Export/MssqlTestCase.php
+++ b/tests/Export/MssqlTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Export_Mssql_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Export/MysqlTestCase.php b/tests/Export/MysqlTestCase.php
index 2f9b27207..06635d058 100644
--- a/tests/Export/MysqlTestCase.php
+++ b/tests/Export/MysqlTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Export_Mysql_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Export/OracleTestCase.php b/tests/Export/OracleTestCase.php
index 3f95acc68..84f6ec6cd 100644
--- a/tests/Export/OracleTestCase.php
+++ b/tests/Export/OracleTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Export_Oracle_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Export/PgsqlTestCase.php b/tests/Export/PgsqlTestCase.php
index f9f0e3537..3c1f0dd7d 100644
--- a/tests/Export/PgsqlTestCase.php
+++ b/tests/Export/PgsqlTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Export_Mysql_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Export/RecordTestCase.php b/tests/Export/RecordTestCase.php
index 39fdaa870..7fca26c6e 100644
--- a/tests/Export/RecordTestCase.php
+++ b/tests/Export/RecordTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Export_Record_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Export/SchemaTestCase.php b/tests/Export/SchemaTestCase.php
index a035ea9df..b293d6a40 100644
--- a/tests/Export/SchemaTestCase.php
+++ b/tests/Export/SchemaTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Export_Schema_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Export/SqliteTestCase.php b/tests/Export/SqliteTestCase.php
index a1e9ed717..9f68e767e 100644
--- a/tests/Export/SqliteTestCase.php
+++ b/tests/Export/SqliteTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Export_Sqlite_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/ExportTestCase.php b/tests/ExportTestCase.php
index 136ddf3bd..e70a2b8fd 100644
--- a/tests/ExportTestCase.php
+++ b/tests/ExportTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Export_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Expression/DriverTestCase.php b/tests/Expression/DriverTestCase.php
index 01f8f6b2d..6ae4eea4e 100644
--- a/tests/Expression/DriverTestCase.php
+++ b/tests/Expression/DriverTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Expression_Driver_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Expression/MssqlTestCase.php b/tests/Expression/MssqlTestCase.php
index 2301a1b65..b91ba1ec2 100644
--- a/tests/Expression/MssqlTestCase.php
+++ b/tests/Expression/MssqlTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Expression_Mssql_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Expression/MysqlTestCase.php b/tests/Expression/MysqlTestCase.php
index 6d2196814..6f30edbca 100644
--- a/tests/Expression/MysqlTestCase.php
+++ b/tests/Expression/MysqlTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Expression_Mysql_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Expression/OracleTestCase.php b/tests/Expression/OracleTestCase.php
index fc78b1660..444775920 100644
--- a/tests/Expression/OracleTestCase.php
+++ b/tests/Expression/OracleTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Expression_Oracle_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Expression/PgsqlTestCase.php b/tests/Expression/PgsqlTestCase.php
index fe0d113ad..95f8e483b 100644
--- a/tests/Expression/PgsqlTestCase.php
+++ b/tests/Expression/PgsqlTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Expression_Pgsql_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Expression/SqliteTestCase.php b/tests/Expression/SqliteTestCase.php
index ec255ed1b..51309f2af 100644
--- a/tests/Expression/SqliteTestCase.php
+++ b/tests/Expression/SqliteTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Expression_Sqlite_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/ExpressionTestCase.php b/tests/ExpressionTestCase.php
index 353b07af9..9f2fd98eb 100644
--- a/tests/ExpressionTestCase.php
+++ b/tests/ExpressionTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Expression_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/ExtensionTestCase.php b/tests/ExtensionTestCase.php
index ed6ce6719..ced4c4785 100755
--- a/tests/ExtensionTestCase.php
+++ b/tests/ExtensionTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Extension_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/ForeignKeyTestCase.php b/tests/ForeignKeyTestCase.php
index 8c460d506..c454b99a2 100644
--- a/tests/ForeignKeyTestCase.php
+++ b/tests/ForeignKeyTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_ForeignKey_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/HookTestCase.php b/tests/HookTestCase.php
index cbdf6ea34..0a0e9ce7c 100644
--- a/tests/HookTestCase.php
+++ b/tests/HookTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Hook_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Hydrate/CollectionInitializationTestCase.php b/tests/Hydrate/CollectionInitializationTestCase.php
index 7c96d7e23..7b715e509 100644
--- a/tests/Hydrate/CollectionInitializationTestCase.php
+++ b/tests/Hydrate/CollectionInitializationTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Hydrate_CollectionInitialization_TestCase.
  *
  * @author      Roman Borschel <roman@code-factory.org>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Hydrate/DriverTestCase.php b/tests/Hydrate/DriverTestCase.php
index fc91b91d7..5a27d9125 100644
--- a/tests/Hydrate/DriverTestCase.php
+++ b/tests/Hydrate/DriverTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Hydrate_Driver_TestCase.
  *
  * @author      Jonathan H. Wage <jonwage@gmail.com>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.1
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Hydrate/FetchModeTestCase.php b/tests/Hydrate/FetchModeTestCase.php
index 25ffa185e..df85dac68 100644
--- a/tests/Hydrate/FetchModeTestCase.php
+++ b/tests/Hydrate/FetchModeTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Hydrate_FetchMode_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Hydrate/PerformanceTestCase.php b/tests/Hydrate/PerformanceTestCase.php
index f04d800a1..a869362b6 100644
--- a/tests/Hydrate/PerformanceTestCase.php
+++ b/tests/Hydrate/PerformanceTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Hydrate_Scalar_TestCase.
  *
  * @author      Roman Borschel <roman@code-factory.org>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.1
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Hydrate/ScalarTestCase.php b/tests/Hydrate/ScalarTestCase.php
index 98ba85df4..4f15e06b0 100644
--- a/tests/Hydrate/ScalarTestCase.php
+++ b/tests/Hydrate/ScalarTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Hydrate_Scalar_TestCase.
  *
  * @author      Roman Borschel <roman@code-factory.org>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.1
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/HydrateTestCase.php b/tests/HydrateTestCase.php
index 702bd60a7..6f29aa01d 100644
--- a/tests/HydrateTestCase.php
+++ b/tests/HydrateTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Hydrate_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/I18nTestCase.php b/tests/I18nTestCase.php
index c1c4f05b1..c65b5a2f7 100644
--- a/tests/I18nTestCase.php
+++ b/tests/I18nTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_I18n_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Import/BuilderTestCase.php b/tests/Import/BuilderTestCase.php
index bed386fe2..466aedc84 100644
--- a/tests/Import/BuilderTestCase.php
+++ b/tests/Import/BuilderTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Import_Builder_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Import/MssqlTestCase.php b/tests/Import/MssqlTestCase.php
index c6f03cd5b..e5e8d5ee0 100644
--- a/tests/Import/MssqlTestCase.php
+++ b/tests/Import/MssqlTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Import_Mssql_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Import/MysqlTestCase.php b/tests/Import/MysqlTestCase.php
index 8831c8184..22cbfe10b 100644
--- a/tests/Import/MysqlTestCase.php
+++ b/tests/Import/MysqlTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Import_Mysql_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Import/OracleTestCase.php b/tests/Import/OracleTestCase.php
index 6d7a43e2b..dd8db55aa 100644
--- a/tests/Import/OracleTestCase.php
+++ b/tests/Import/OracleTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Import_Oracle_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Import/PgsqlTestCase.php b/tests/Import/PgsqlTestCase.php
index dc617502b..57466e2a2 100644
--- a/tests/Import/PgsqlTestCase.php
+++ b/tests/Import/PgsqlTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Import_Pgsql_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Import/PluginHierarchyTestCase.php b/tests/Import/PluginHierarchyTestCase.php
index 4bc736957..53656ca56 100644
--- a/tests/Import/PluginHierarchyTestCase.php
+++ b/tests/Import/PluginHierarchyTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Import_PluginHierarchy_TestCase.
  *
  * @author      Brice Figureau <brice+doctrine@daysofwonder.com>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Import/SchemaTestCase.php b/tests/Import/SchemaTestCase.php
index e889c7894..7b90edabe 100644
--- a/tests/Import/SchemaTestCase.php
+++ b/tests/Import/SchemaTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Import_Schema_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Import/SqliteTestCase.php b/tests/Import/SqliteTestCase.php
index 3231418fb..2e6735d5b 100644
--- a/tests/Import/SqliteTestCase.php
+++ b/tests/Import/SqliteTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Import_Sqlite_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/ImportTestCase.php b/tests/ImportTestCase.php
index a66ecc24b..0fd29872b 100644
--- a/tests/ImportTestCase.php
+++ b/tests/ImportTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Import_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/IntegrityActionTestCase.php b/tests/IntegrityActionTestCase.php
index 8b0f042ab..8ed7d39dc 100644
--- a/tests/IntegrityActionTestCase.php
+++ b/tests/IntegrityActionTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_IntegrityAction_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/ManagerTestCase.php b/tests/ManagerTestCase.php
index 8d3ed45f1..eec0b1e54 100644
--- a/tests/ManagerTestCase.php
+++ b/tests/ManagerTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Manager_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Migration/BaseTestCase.php b/tests/Migration/BaseTestCase.php
index 5967369c8..691efc339 100644
--- a/tests/Migration/BaseTestCase.php
+++ b/tests/Migration/BaseTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Migration_Base_TestCase.
  *
  * @author      Dan Bettles <danbettles@yahoo.co.uk>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Migration/DiffTestCase.php b/tests/Migration/DiffTestCase.php
index d573988ba..40e184409 100644
--- a/tests/Migration/DiffTestCase.php
+++ b/tests/Migration/DiffTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Migration_Diff_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/MigrationTestCase.php b/tests/MigrationTestCase.php
index 34fbd53db..6c1e55adb 100644
--- a/tests/MigrationTestCase.php
+++ b/tests/MigrationTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Migration_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/NestedSet/HydrationTestCase.php b/tests/NestedSet/HydrationTestCase.php
index cbf50e2af..b727d859f 100644
--- a/tests/NestedSet/HydrationTestCase.php
+++ b/tests/NestedSet/HydrationTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Record_State_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/NestedSet/MultiRootTestCase.php b/tests/NestedSet/MultiRootTestCase.php
index 8cb8b3970..460af07e4 100644
--- a/tests/NestedSet/MultiRootTestCase.php
+++ b/tests/NestedSet/MultiRootTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Record_State_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/NestedSet/SingleRootTestCase.php b/tests/NestedSet/SingleRootTestCase.php
index 353217194..bf0d4bf74 100644
--- a/tests/NestedSet/SingleRootTestCase.php
+++ b/tests/NestedSet/SingleRootTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Record_State_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/NestedSet/TimestampableMultiRootTestCase.php b/tests/NestedSet/TimestampableMultiRootTestCase.php
index e243a11a8..97a242c67 100644
--- a/tests/NestedSet/TimestampableMultiRootTestCase.php
+++ b/tests/NestedSet/TimestampableMultiRootTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Record_State_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/NewCoreTestCase.php b/tests/NewCoreTestCase.php
index 38372bb11..c4b3deeb4 100644
--- a/tests/NewCoreTestCase.php
+++ b/tests/NewCoreTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_NewCore_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/OneTableOneClassInheritanceTestCase.php b/tests/OneTableOneClassInheritanceTestCase.php
index aa2662fc6..8b1cb2a7d 100644
--- a/tests/OneTableOneClassInheritanceTestCase.php
+++ b/tests/OneTableOneClassInheritanceTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_OneTableOneClassInheritance_TestCase.
  *
  * @author      Bjarte Stien Karlsen <bjartka@pvv.ntnu.no>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/ParserTestCase.php b/tests/ParserTestCase.php
index 309e26da8..350a833bc 100644
--- a/tests/ParserTestCase.php
+++ b/tests/ParserTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Parser_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/PessimisticLockingTestCase.php b/tests/PessimisticLockingTestCase.php
index 83e795a99..2b146bafb 100644
--- a/tests/PessimisticLockingTestCase.php
+++ b/tests/PessimisticLockingTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Boolean_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/PluginTestCase.php b/tests/PluginTestCase.php
index e32766e94..07e80f048 100644
--- a/tests/PluginTestCase.php
+++ b/tests/PluginTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Plugin_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Query/AggregateValueTestCase.php b/tests/Query/AggregateValueTestCase.php
index e629e82c5..1a20e5aa5 100644
--- a/tests/Query/AggregateValueTestCase.php
+++ b/tests/Query/AggregateValueTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Query_AggregateValue_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Query/ApplyInheritanceTestCase.php b/tests/Query/ApplyInheritanceTestCase.php
index f13fbfb2a..27e763267 100644
--- a/tests/Query/ApplyInheritanceTestCase.php
+++ b/tests/Query/ApplyInheritanceTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Query_ApplyInheritance_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Query/CacheTestCase.php b/tests/Query/CacheTestCase.php
index 1b8f09f3a..3b5981074 100644
--- a/tests/Query/CacheTestCase.php
+++ b/tests/Query/CacheTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Query_Cache_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Query/CheckTestCase.php b/tests/Query/CheckTestCase.php
index 8a16ff991..4c265790b 100644
--- a/tests/Query/CheckTestCase.php
+++ b/tests/Query/CheckTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Query_Check_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Query/ComponentAliasTestCase.php b/tests/Query/ComponentAliasTestCase.php
index 22d01c86a..409147023 100644
--- a/tests/Query/ComponentAliasTestCase.php
+++ b/tests/Query/ComponentAliasTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Query_ComponentAlias_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Query/ConditionTestCase.php b/tests/Query/ConditionTestCase.php
index d097220f3..94581879d 100644
--- a/tests/Query/ConditionTestCase.php
+++ b/tests/Query/ConditionTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Query_Condition_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Query/CopyTestCase.php b/tests/Query/CopyTestCase.php
index 70d45c2cf..ede3019a8 100644
--- a/tests/Query/CopyTestCase.php
+++ b/tests/Query/CopyTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Query_Copy_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Query/DeleteTestCase.php b/tests/Query/DeleteTestCase.php
index cd7a74b18..ad69b30de 100644
--- a/tests/Query/DeleteTestCase.php
+++ b/tests/Query/DeleteTestCase.php
@@ -24,14 +24,10 @@
  * This test case is used for testing DQL DELETE queries.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Query/DriverTestCase.php b/tests/Query/DriverTestCase.php
index 61ad8baa7..137928e52 100644
--- a/tests/Query/DriverTestCase.php
+++ b/tests/Query/DriverTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Query_Driver_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Query/ExpressionTestCase.php b/tests/Query/ExpressionTestCase.php
index 92cc508d6..fdabe6363 100644
--- a/tests/Query/ExpressionTestCase.php
+++ b/tests/Query/ExpressionTestCase.php
@@ -22,15 +22,11 @@
 /**
  * Doctrine_Query_Expression_TestCase.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  *
- * @version     $Revision$
- *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
  *
  * @internal
  *
diff --git a/tests/Query/FromTestCase.php b/tests/Query/FromTestCase.php
index 42e23e44d..cd4b89677 100644
--- a/tests/Query/FromTestCase.php
+++ b/tests/Query/FromTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Query_From_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Query/GroupbyTestCase.php b/tests/Query/GroupbyTestCase.php
index 2dfe639e8..f5546894d 100644
--- a/tests/Query/GroupbyTestCase.php
+++ b/tests/Query/GroupbyTestCase.php
@@ -22,15 +22,11 @@
 /**
  * Doctrine_Query_Groupby_TestCase.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  *
- * @version     $Revision$
- *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
  *
  * @internal
  *
diff --git a/tests/Query/HavingTestCase.php b/tests/Query/HavingTestCase.php
index 46b235daf..c76dc503e 100644
--- a/tests/Query/HavingTestCase.php
+++ b/tests/Query/HavingTestCase.php
@@ -22,15 +22,11 @@
 /**
  * Doctrine_Query_Having_TestCase.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  *
- * @version     $Revision$
- *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
  *
  * @internal
  *
diff --git a/tests/Query/HydrateNoneTestCase.php b/tests/Query/HydrateNoneTestCase.php
index fbd148d13..9276e5462 100644
--- a/tests/Query/HydrateNoneTestCase.php
+++ b/tests/Query/HydrateNoneTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Query_Check_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Query/IdentifierQuotingTestCase.php b/tests/Query/IdentifierQuotingTestCase.php
index 7a56e6bf3..b9f0ed0c1 100644
--- a/tests/Query/IdentifierQuotingTestCase.php
+++ b/tests/Query/IdentifierQuotingTestCase.php
@@ -26,14 +26,10 @@
  * if idenfitier quoting is turned on
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Query/JoinConditionTestCase.php b/tests/Query/JoinConditionTestCase.php
index 3425a3c48..7c668019a 100644
--- a/tests/Query/JoinConditionTestCase.php
+++ b/tests/Query/JoinConditionTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Query_JoinCondition_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Query/JoinTestCase.php b/tests/Query/JoinTestCase.php
index 2d8342aa6..580554942 100644
--- a/tests/Query/JoinTestCase.php
+++ b/tests/Query/JoinTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Query_JoinCondition_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Query/LimitTestCase.php b/tests/Query/LimitTestCase.php
index 28d94f64f..3d4c45d2c 100644
--- a/tests/Query/LimitTestCase.php
+++ b/tests/Query/LimitTestCase.php
@@ -25,14 +25,10 @@
  * This test case is used for testing DQL LIMIT clause
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Query/MultiJoin2TestCase.php b/tests/Query/MultiJoin2TestCase.php
index f42849833..e315d1725 100644
--- a/tests/Query/MultiJoin2TestCase.php
+++ b/tests/Query/MultiJoin2TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Query_MultiJoin2_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Query/MultiJoinTestCase.php b/tests/Query/MultiJoinTestCase.php
index f667f221d..0995fb431 100644
--- a/tests/Query/MultiJoinTestCase.php
+++ b/tests/Query/MultiJoinTestCase.php
@@ -26,14 +26,10 @@
  * are ordered by the primary key. This test case illustrate this behavior.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Query/MultipleAggregateValueTestCase.php b/tests/Query/MultipleAggregateValueTestCase.php
index 44d986725..fee5da1d1 100644
--- a/tests/Query/MultipleAggregateValueTestCase.php
+++ b/tests/Query/MultipleAggregateValueTestCase.php
@@ -24,14 +24,10 @@
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  * @author      Jonathan H. Wage <jonwage@gmail.com>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Query/MysqlSubqueryHavingTestCase.php b/tests/Query/MysqlSubqueryHavingTestCase.php
index 86b85423f..3f4523296 100644
--- a/tests/Query/MysqlSubqueryHavingTestCase.php
+++ b/tests/Query/MysqlSubqueryHavingTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Query_MysqlSubquery_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Query/MysqlSubqueryTestCase.php b/tests/Query/MysqlSubqueryTestCase.php
index c7b4348a0..0d277fdb2 100644
--- a/tests/Query/MysqlSubqueryTestCase.php
+++ b/tests/Query/MysqlSubqueryTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Query_MysqlSubquery_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Query/OneToOneFetchingTestCase.php b/tests/Query/OneToOneFetchingTestCase.php
index 4b84c9c3d..5da6587e4 100644
--- a/tests/Query/OneToOneFetchingTestCase.php
+++ b/tests/Query/OneToOneFetchingTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Query_MultiJoin2_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Query/OrderbyTestCase.php b/tests/Query/OrderbyTestCase.php
index 99ca5bb5b..6b3e059c5 100644
--- a/tests/Query/OrderbyTestCase.php
+++ b/tests/Query/OrderbyTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Query_Orderby_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Query/PgsqlSubqueryTestCase.php b/tests/Query/PgsqlSubqueryTestCase.php
index e66d16bc3..45b3f99d8 100644
--- a/tests/Query/PgsqlSubqueryTestCase.php
+++ b/tests/Query/PgsqlSubqueryTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Query_PgsqlSubquery_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Query/ReferenceModelTestCase.php b/tests/Query/ReferenceModelTestCase.php
index 86babcd93..002992494 100644
--- a/tests/Query/ReferenceModelTestCase.php
+++ b/tests/Query/ReferenceModelTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Query_ReferenceModel_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Query/RegistryTestCase.php b/tests/Query/RegistryTestCase.php
index 8f8a5593a..70175cd3d 100644
--- a/tests/Query/RegistryTestCase.php
+++ b/tests/Query/RegistryTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Query_Registry_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Query/RemoveQueryPartTestCase.php b/tests/Query/RemoveQueryPartTestCase.php
index 9b16aab4d..ca7b87499 100644
--- a/tests/Query/RemoveQueryPartTestCase.php
+++ b/tests/Query/RemoveQueryPartTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Query_Copy_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Query/SelectExpressionTestCase.php b/tests/Query/SelectExpressionTestCase.php
index be66862f6..398cad487 100644
--- a/tests/Query/SelectExpressionTestCase.php
+++ b/tests/Query/SelectExpressionTestCase.php
@@ -24,14 +24,10 @@
  * This test case is used for testing DQL SELECT expressions functionality.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Query/SelectTestCase.php b/tests/Query/SelectTestCase.php
index aaeaecece..76b0f5a47 100644
--- a/tests/Query/SelectTestCase.php
+++ b/tests/Query/SelectTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Query_Select_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Query/SubqueryTestCase.php b/tests/Query/SubqueryTestCase.php
index 24d7dae62..c4494d25b 100644
--- a/tests/Query/SubqueryTestCase.php
+++ b/tests/Query/SubqueryTestCase.php
@@ -24,14 +24,10 @@
  * This test case is used for testing DQL subquery functionality.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Query/UpdateTestCase.php b/tests/Query/UpdateTestCase.php
index 43542da40..bede75c3e 100644
--- a/tests/Query/UpdateTestCase.php
+++ b/tests/Query/UpdateTestCase.php
@@ -24,14 +24,10 @@
  * This test case is used for testing DQL UPDATE queries.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Query/WhereTestCase.php b/tests/Query/WhereTestCase.php
index 9cdb52f61..92c6f1e4b 100644
--- a/tests/Query/WhereTestCase.php
+++ b/tests/Query/WhereTestCase.php
@@ -24,14 +24,10 @@
  * This test case is used for testing DQL WHERE part functionality.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/QueryTestCase.php b/tests/QueryTestCase.php
index cd56d82e0..84923c97f 100644
--- a/tests/QueryTestCase.php
+++ b/tests/QueryTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Query_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/RawSqlTestCase.php b/tests/RawSqlTestCase.php
index dc2a9550e..20347c032 100644
--- a/tests/RawSqlTestCase.php
+++ b/tests/RawSqlTestCase.php
@@ -23,14 +23,9 @@
  * Doctrine_RawSql_TestCase
  * This class tests the functinality of Doctrine_RawSql component.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 1181 $
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  *
diff --git a/tests/Record/CascadingDeleteTestCase.php b/tests/Record/CascadingDeleteTestCase.php
index 5ccd135e7..78d0be7a8 100644
--- a/tests/Record/CascadingDeleteTestCase.php
+++ b/tests/Record/CascadingDeleteTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_CascadingDelete_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Record/FilterTestCase.php b/tests/Record/FilterTestCase.php
index 1c1eaf5ad..56c7472a0 100644
--- a/tests/Record/FilterTestCase.php
+++ b/tests/Record/FilterTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Record_Filter_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Record/FromArrayTestCase.php b/tests/Record/FromArrayTestCase.php
index 885e090e9..a709a2dcc 100755
--- a/tests/Record/FromArrayTestCase.php
+++ b/tests/Record/FromArrayTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Record_FromArray_TestCase.
  *
  * @author      Stephen Ostrow <sostrow@sowebdesigns.com>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Record/GeneratorTestCase.php b/tests/Record/GeneratorTestCase.php
index 50ea64d7f..46af17747 100644
--- a/tests/Record/GeneratorTestCase.php
+++ b/tests/Record/GeneratorTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Record_Generator_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Record/HookTestCase.php b/tests/Record/HookTestCase.php
index dff77bebf..bdbf40dc1 100644
--- a/tests/Record/HookTestCase.php
+++ b/tests/Record/HookTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Record_Hook_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Record/InheritanceTestCase.php b/tests/Record/InheritanceTestCase.php
index 42775515a..021c1d270 100644
--- a/tests/Record/InheritanceTestCase.php
+++ b/tests/Record/InheritanceTestCase.php
@@ -9,14 +9,10 @@
  * be an area where subtle breakage can sneak in.
  *
  * @author      David Brewer <dbrewer@secondstory.com>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Record/SaveBlankRecordTestCase.php b/tests/Record/SaveBlankRecordTestCase.php
index e36f826ee..f7f43bbb3 100644
--- a/tests/Record/SaveBlankRecordTestCase.php
+++ b/tests/Record/SaveBlankRecordTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Record_State_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Record/SerializeUnserializeTestCase.php b/tests/Record/SerializeUnserializeTestCase.php
index 8eaec238e..8a235a863 100644
--- a/tests/Record/SerializeUnserializeTestCase.php
+++ b/tests/Record/SerializeUnserializeTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Record_SerializeUnserialize_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Record/StateTestCase.php b/tests/Record/StateTestCase.php
index fcec2ee13..3240c37d0 100644
--- a/tests/Record/StateTestCase.php
+++ b/tests/Record/StateTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Record_State_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Record/SynchronizeTestCase.php b/tests/Record/SynchronizeTestCase.php
index 421671c28..03eaa9a95 100644
--- a/tests/Record/SynchronizeTestCase.php
+++ b/tests/Record/SynchronizeTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Record_State_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Record/ZeroValuesTestCase.php b/tests/Record/ZeroValuesTestCase.php
index ffb65cb1c..29c8ae97e 100644
--- a/tests/Record/ZeroValuesTestCase.php
+++ b/tests/Record/ZeroValuesTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Record_State_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/RecordTestCase.php b/tests/RecordTestCase.php
index 5d9a57b2f..e953fcdf1 100644
--- a/tests/RecordTestCase.php
+++ b/tests/RecordTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Record_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Relation/CircularSavingTestCase.php b/tests/Relation/CircularSavingTestCase.php
index b29dabf09..bad2b596c 100644
--- a/tests/Relation/CircularSavingTestCase.php
+++ b/tests/Relation/CircularSavingTestCase.php
@@ -24,14 +24,10 @@
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  * @author      Jan Schaefer <tanken@gmx.de>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Relation/ManyToMany2TestCase.php b/tests/Relation/ManyToMany2TestCase.php
index c01600312..2e0843ecc 100644
--- a/tests/Relation/ManyToMany2TestCase.php
+++ b/tests/Relation/ManyToMany2TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Relation_Parser_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Relation/NestTestCase.php b/tests/Relation/NestTestCase.php
index 82817a565..ca2c97769 100644
--- a/tests/Relation/NestTestCase.php
+++ b/tests/Relation/NestTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Relation_Nest_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Relation/OneToManyTestCase.php b/tests/Relation/OneToManyTestCase.php
index 44df16967..7637625fc 100644
--- a/tests/Relation/OneToManyTestCase.php
+++ b/tests/Relation/OneToManyTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Relation_OneToOne_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Relation/OneToOneTestCase.php b/tests/Relation/OneToOneTestCase.php
index 77027886f..9111f5ce1 100644
--- a/tests/Relation/OneToOneTestCase.php
+++ b/tests/Relation/OneToOneTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Relation_OneToOne_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Relation/OrderByTestCase.php b/tests/Relation/OrderByTestCase.php
index 462875b13..16bf6c7a0 100644
--- a/tests/Relation/OrderByTestCase.php
+++ b/tests/Relation/OrderByTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Relation_OrderBy_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Relation/ParserTestCase.php b/tests/Relation/ParserTestCase.php
index ec0298d7b..aa1a3c885 100644
--- a/tests/Relation/ParserTestCase.php
+++ b/tests/Relation/ParserTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Relation_Parser_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/RelationTestCase.php b/tests/RelationTestCase.php
index 4b36310d4..ca6f68180 100644
--- a/tests/RelationTestCase.php
+++ b/tests/RelationTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Relation_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Search/FileTestCase.php b/tests/Search/FileTestCase.php
index ac04aa1ad..9ad2bd51a 100644
--- a/tests/Search/FileTestCase.php
+++ b/tests/Search/FileTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Search_File_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Search/IndexerTestCase.php b/tests/Search/IndexerTestCase.php
index 750918dd9..17229aaf5 100644
--- a/tests/Search/IndexerTestCase.php
+++ b/tests/Search/IndexerTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Search_Indexer_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Search/QueryTestCase.php b/tests/Search/QueryTestCase.php
index 48cacfc4d..ef531c5e1 100644
--- a/tests/Search/QueryTestCase.php
+++ b/tests/Search/QueryTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Search_Query_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Search/QueryWeightTestCase.php b/tests/Search/QueryWeightTestCase.php
index 931c863a2..849db60ec 100644
--- a/tests/Search/QueryWeightTestCase.php
+++ b/tests/Search/QueryWeightTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Search_QueryWeight_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/SearchTestCase.php b/tests/SearchTestCase.php
index 0c5e99528..28bb6eaf9 100644
--- a/tests/SearchTestCase.php
+++ b/tests/SearchTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Search_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Sequence/MssqlTestCase.php b/tests/Sequence/MssqlTestCase.php
index a5214ce13..109821389 100644
--- a/tests/Sequence/MssqlTestCase.php
+++ b/tests/Sequence/MssqlTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Sequence_Mssql_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Sequence/MysqlTestCase.php b/tests/Sequence/MysqlTestCase.php
index 46f1e75d2..6a796f145 100644
--- a/tests/Sequence/MysqlTestCase.php
+++ b/tests/Sequence/MysqlTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Sequence_Mysql_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Sequence/OracleTestCase.php b/tests/Sequence/OracleTestCase.php
index d567dd2a3..770a48b49 100644
--- a/tests/Sequence/OracleTestCase.php
+++ b/tests/Sequence/OracleTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Sequence_Oracle_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Sequence/PgsqlTestCase.php b/tests/Sequence/PgsqlTestCase.php
index 8c76b377b..7eee3758b 100644
--- a/tests/Sequence/PgsqlTestCase.php
+++ b/tests/Sequence/PgsqlTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Sequence_Pgsql_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Sequence/SqliteTestCase.php b/tests/Sequence/SqliteTestCase.php
index 8d69ca9eb..223c46462 100644
--- a/tests/Sequence/SqliteTestCase.php
+++ b/tests/Sequence/SqliteTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Sequence_Sqlite_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/SequenceTestCase.php b/tests/SequenceTestCase.php
index 3f837e9c2..129896f37 100644
--- a/tests/SequenceTestCase.php
+++ b/tests/SequenceTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Sequence_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/SoftDeleteBCTestCase.php b/tests/SoftDeleteBCTestCase.php
index eadf42d6c..ca58eae67 100644
--- a/tests/SoftDeleteBCTestCase.php
+++ b/tests/SoftDeleteBCTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_SoftDeleteBC_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/SoftDeleteTestCase.php b/tests/SoftDeleteTestCase.php
index b2b7212cb..889bed51a 100644
--- a/tests/SoftDeleteTestCase.php
+++ b/tests/SoftDeleteTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_SoftDelete_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Table/NamedQueryTestCase.php b/tests/Table/NamedQueryTestCase.php
index 93b69f9d6..31179c2c7 100644
--- a/tests/Table/NamedQueryTestCase.php
+++ b/tests/Table/NamedQueryTestCase.php
@@ -23,12 +23,8 @@
  * Doctrine_Query_Registry.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Table/RemoveColumnTestCase.php b/tests/Table/RemoveColumnTestCase.php
index 3f9db6d61..8bdd97e7a 100644
--- a/tests/Table/RemoveColumnTestCase.php
+++ b/tests/Table/RemoveColumnTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_TableRemoveColumn_TestCase.
  *
  * @author      Dennis Verspuij <dennis.verspuij@gmail.com>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/TableTestCase.php b/tests/TableTestCase.php
index 32d471a48..102e91f8f 100644
--- a/tests/TableTestCase.php
+++ b/tests/TableTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Table_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/TaskTestCase.php b/tests/TaskTestCase.php
index 64a90f2d6..1f223defb 100644
--- a/tests/TaskTestCase.php
+++ b/tests/TaskTestCase.php
@@ -26,14 +26,10 @@
  * subclasses are declared at the bottom of this file.
  *
  * @author      Dan Bettles <danbettles@yahoo.co.uk>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/TemplateTestCase.php b/tests/TemplateTestCase.php
index c07145111..5801623af 100644
--- a/tests/TemplateTestCase.php
+++ b/tests/TemplateTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Template_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1015TestCase.php b/tests/Ticket/1015TestCase.php
index 34531f3c4..9eedf626e 100644
--- a/tests/Ticket/1015TestCase.php
+++ b/tests/Ticket/1015TestCase.php
@@ -22,14 +22,9 @@
 /**
  * Doctrine_Ticket_1015_TestCase.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1028TestCase.php b/tests/Ticket/1028TestCase.php
index e7e568069..ac72151d8 100644
--- a/tests/Ticket/1028TestCase.php
+++ b/tests/Ticket/1028TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_I18nRelation_TestCase.
  *
  * @author      Brice Figureau <brice+doctrine@daysofwonder.com>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1044TestCase.php b/tests/Ticket/1044TestCase.php
index 0c92a8b60..6320eded8 100644
--- a/tests/Ticket/1044TestCase.php
+++ b/tests/Ticket/1044TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_1044_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1071TestCase.php b/tests/Ticket/1071TestCase.php
index 09fd9da96..b0b786450 100644
--- a/tests/Ticket/1071TestCase.php
+++ b/tests/Ticket/1071TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_1071_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1077TestCase.php b/tests/Ticket/1077TestCase.php
index 050c7410d..5cd6d03d6 100644
--- a/tests/Ticket/1077TestCase.php
+++ b/tests/Ticket/1077TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_1077_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1106TestCase.php b/tests/Ticket/1106TestCase.php
index fb5ce41f8..a1a6aa88a 100644
--- a/tests/Ticket/1106TestCase.php
+++ b/tests/Ticket/1106TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_1106_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1116TestCase.php b/tests/Ticket/1116TestCase.php
index 3ed92c160..d18456ce1 100644
--- a/tests/Ticket/1116TestCase.php
+++ b/tests/Ticket/1116TestCase.php
@@ -24,14 +24,10 @@
  * Doctrine_Ticket_1116_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1118TestCase.php b/tests/Ticket/1118TestCase.php
index 38ec237a2..905989ff8 100644
--- a/tests/Ticket/1118TestCase.php
+++ b/tests/Ticket/1118TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_1118_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1121TestCase.php b/tests/Ticket/1121TestCase.php
index 8e42a7cdf..1d80f07dd 100644
--- a/tests/Ticket/1121TestCase.php
+++ b/tests/Ticket/1121TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_1121_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1123TestCase.php b/tests/Ticket/1123TestCase.php
index 97de8ca66..efaf17afc 100644
--- a/tests/Ticket/1123TestCase.php
+++ b/tests/Ticket/1123TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_1123_TestCase.
  *
  * @author      Jfung
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1125TestCase.php b/tests/Ticket/1125TestCase.php
index fb17e4dc7..d3b0c8307 100644
--- a/tests/Ticket/1125TestCase.php
+++ b/tests/Ticket/1125TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_1125_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1131TestCase.php b/tests/Ticket/1131TestCase.php
index 429813e75..a4aac558f 100644
--- a/tests/Ticket/1131TestCase.php
+++ b/tests/Ticket/1131TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_1280_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1133TestCase.php b/tests/Ticket/1133TestCase.php
index 7b7adf67e..923f9e017 100644
--- a/tests/Ticket/1133TestCase.php
+++ b/tests/Ticket/1133TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_1133_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1134TestCase.php b/tests/Ticket/1134TestCase.php
index e21ebf69c..c10e8465e 100644
--- a/tests/Ticket/1134TestCase.php
+++ b/tests/Ticket/1134TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_1134_TestCase.
  *
  * @author      Jeff Hansen <jhansen@hivalley.com>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1160TestCase.php b/tests/Ticket/1160TestCase.php
index c4d9d6393..2a359b7a5 100644
--- a/tests/Ticket/1160TestCase.php
+++ b/tests/Ticket/1160TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_1160_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1192TestCase.php b/tests/Ticket/1192TestCase.php
index 736bf0f5a..ba9285fc1 100644
--- a/tests/Ticket/1192TestCase.php
+++ b/tests/Ticket/1192TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_1192_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1206TestCase.php b/tests/Ticket/1206TestCase.php
index ddaa798db..1e9ca19b5 100644
--- a/tests/Ticket/1206TestCase.php
+++ b/tests/Ticket/1206TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_1206_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1208TestCase.php b/tests/Ticket/1208TestCase.php
index 5714ebfe1..e2ec0c8a8 100644
--- a/tests/Ticket/1208TestCase.php
+++ b/tests/Ticket/1208TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_1208_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1211TestCase.php b/tests/Ticket/1211TestCase.php
index 130ddc22e..4596db058 100644
--- a/tests/Ticket/1211TestCase.php
+++ b/tests/Ticket/1211TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_1211_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1213TestCase.php b/tests/Ticket/1213TestCase.php
index d8b34acee..f08166957 100644
--- a/tests/Ticket/1213TestCase.php
+++ b/tests/Ticket/1213TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_1213_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1228TestCase.php b/tests/Ticket/1228TestCase.php
index 82c39805c..e72d8c387 100644
--- a/tests/Ticket/1228TestCase.php
+++ b/tests/Ticket/1228TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Template_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1230TestCase.php b/tests/Ticket/1230TestCase.php
index 5c1ddc344..5308b3735 100644
--- a/tests/Ticket/1230TestCase.php
+++ b/tests/Ticket/1230TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_1230_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1236TestCase.php b/tests/Ticket/1236TestCase.php
index d77cfe263..2d27dcd6d 100644
--- a/tests/Ticket/1236TestCase.php
+++ b/tests/Ticket/1236TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_1236_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1244TestCase.php b/tests/Ticket/1244TestCase.php
index f4096669a..00fe92979 100644
--- a/tests/Ticket/1244TestCase.php
+++ b/tests/Ticket/1244TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_1244_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1250TestCase.php b/tests/Ticket/1250TestCase.php
index d00c81949..5bd11bcdb 100644
--- a/tests/Ticket/1250TestCase.php
+++ b/tests/Ticket/1250TestCase.php
@@ -22,14 +22,9 @@
 /**
  * Doctrine_Ticket_1015_TestCase.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1251TestCase.php b/tests/Ticket/1251TestCase.php
index 69fe1a145..6ece88674 100644
--- a/tests/Ticket/1251TestCase.php
+++ b/tests/Ticket/1251TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_384_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1253TestCase.php b/tests/Ticket/1253TestCase.php
index 91c19e3b5..17a8284c2 100644
--- a/tests/Ticket/1253TestCase.php
+++ b/tests/Ticket/1253TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_1253_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1254TestCase.php b/tests/Ticket/1254TestCase.php
index 2df5af6f8..0281f3376 100644
--- a/tests/Ticket/1254TestCase.php
+++ b/tests/Ticket/1254TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_1254_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1257TestCase.php b/tests/Ticket/1257TestCase.php
index 6c6c6c3eb..1b79088d2 100644
--- a/tests/Ticket/1257TestCase.php
+++ b/tests/Ticket/1257TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_1257_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1276TestCase.php b/tests/Ticket/1276TestCase.php
index 7045ad0e1..67647451c 100644
--- a/tests/Ticket/1276TestCase.php
+++ b/tests/Ticket/1276TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_1276_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1277TestCase.php b/tests/Ticket/1277TestCase.php
index a5fcc8590..60514cc1d 100644
--- a/tests/Ticket/1277TestCase.php
+++ b/tests/Ticket/1277TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_1277_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1280TestCase.php b/tests/Ticket/1280TestCase.php
index 5e3a70df4..a441426d1 100644
--- a/tests/Ticket/1280TestCase.php
+++ b/tests/Ticket/1280TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_1280_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1281TestCase.php b/tests/Ticket/1281TestCase.php
index 48ea88cc9..ca5bd25d3 100644
--- a/tests/Ticket/1281TestCase.php
+++ b/tests/Ticket/1281TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_1281_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1289TestCase.php b/tests/Ticket/1289TestCase.php
index 2423a3343..b2c9749f1 100644
--- a/tests/Ticket/1289TestCase.php
+++ b/tests/Ticket/1289TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_1289_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1296TestCase.php b/tests/Ticket/1296TestCase.php
index 93012544b..b7755cf37 100644
--- a/tests/Ticket/1296TestCase.php
+++ b/tests/Ticket/1296TestCase.php
@@ -22,14 +22,9 @@
 /**
  * Doctrine_Ticket_1296_TestCase.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1304TestCase.php b/tests/Ticket/1304TestCase.php
index d06c54bcc..56bc1eb2b 100644
--- a/tests/Ticket/1304TestCase.php
+++ b/tests/Ticket/1304TestCase.php
@@ -22,14 +22,9 @@
 /**
  * Doctrine_Ticket_1304_TestCase.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1305TestCase.php b/tests/Ticket/1305TestCase.php
index af14ecb19..eaa12483d 100644
--- a/tests/Ticket/1305TestCase.php
+++ b/tests/Ticket/1305TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_1305_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1307TestCase.php b/tests/Ticket/1307TestCase.php
index a4c533ddf..1b3f38a90 100644
--- a/tests/Ticket/1307TestCase.php
+++ b/tests/Ticket/1307TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_1307_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1315TestCase.php b/tests/Ticket/1315TestCase.php
index f8f1350c2..196c1c58f 100644
--- a/tests/Ticket/1315TestCase.php
+++ b/tests/Ticket/1315TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_1315_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1325TestCase.php b/tests/Ticket/1325TestCase.php
index 5176fe39a..446093342 100644
--- a/tests/Ticket/1325TestCase.php
+++ b/tests/Ticket/1325TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_1325_TestCase.
  *
  * @author      Andrea Baron <andrea@bhweb.it>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1326TestCase.php b/tests/Ticket/1326TestCase.php
index e9398e425..ea105e3cb 100644
--- a/tests/Ticket/1326TestCase.php
+++ b/tests/Ticket/1326TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_1326_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1335TestCase.php b/tests/Ticket/1335TestCase.php
index 532504737..72d91ab3e 100644
--- a/tests/Ticket/1335TestCase.php
+++ b/tests/Ticket/1335TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_1335_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1338TestCase.php b/tests/Ticket/1338TestCase.php
index 7f56b992f..a1260042d 100644
--- a/tests/Ticket/1338TestCase.php
+++ b/tests/Ticket/1338TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_1338_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1341TestCase.php b/tests/Ticket/1341TestCase.php
index 483b8c7e2..03bbdc994 100644
--- a/tests/Ticket/1341TestCase.php
+++ b/tests/Ticket/1341TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_1341_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1351TestCase.php b/tests/Ticket/1351TestCase.php
index 171f2e04d..294ad09a4 100644
--- a/tests/Ticket/1351TestCase.php
+++ b/tests/Ticket/1351TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_1351_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1365TestCase.php b/tests/Ticket/1365TestCase.php
index b4723f2b6..22e3a14b7 100644
--- a/tests/Ticket/1365TestCase.php
+++ b/tests/Ticket/1365TestCase.php
@@ -28,9 +28,6 @@
  * @category    Query
  *
  * @see        www.doctrine-project.org
- * @since       0.10.4
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1372TestCase.php b/tests/Ticket/1372TestCase.php
index 6e8e72ee8..ecab95b27 100644
--- a/tests/Ticket/1372TestCase.php
+++ b/tests/Ticket/1372TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_1372_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1380TestCase.php b/tests/Ticket/1380TestCase.php
index 3f7f9bb78..62b80c6b1 100644
--- a/tests/Ticket/1380TestCase.php
+++ b/tests/Ticket/1380TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_1380_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1381TestCase.php b/tests/Ticket/1381TestCase.php
index 935550b39..82e01b35d 100644
--- a/tests/Ticket/1381TestCase.php
+++ b/tests/Ticket/1381TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_1381_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1383TestCase.php b/tests/Ticket/1383TestCase.php
index a0a7b0e28..ba8e5acbb 100644
--- a/tests/Ticket/1383TestCase.php
+++ b/tests/Ticket/1383TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_1383_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1385TestCase.php b/tests/Ticket/1385TestCase.php
index a8ab11883..5b289154f 100644
--- a/tests/Ticket/1385TestCase.php
+++ b/tests/Ticket/1385TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_1385_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1390TestCase.php b/tests/Ticket/1390TestCase.php
index 87a068191..80905ba8d 100644
--- a/tests/Ticket/1390TestCase.php
+++ b/tests/Ticket/1390TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_1390_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1395TestCase.php b/tests/Ticket/1395TestCase.php
index 70b695174..befe7f60f 100644
--- a/tests/Ticket/1395TestCase.php
+++ b/tests/Ticket/1395TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_1395_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1400TestCase.php b/tests/Ticket/1400TestCase.php
index f8884e2a3..27733a7a2 100644
--- a/tests/Ticket/1400TestCase.php
+++ b/tests/Ticket/1400TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_1400_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1417TestCase.php b/tests/Ticket/1417TestCase.php
index 0dd8c9a53..fb655c75b 100644
--- a/tests/Ticket/1417TestCase.php
+++ b/tests/Ticket/1417TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_1417_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1419TestCase.php b/tests/Ticket/1419TestCase.php
index 8ebcfb49f..c6097b3ae 100644
--- a/tests/Ticket/1419TestCase.php
+++ b/tests/Ticket/1419TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_1419_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1436TestCase.php b/tests/Ticket/1436TestCase.php
index 7452a8e8e..9e6849805 100644
--- a/tests/Ticket/1436TestCase.php
+++ b/tests/Ticket/1436TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_1436_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1441TestCase.php b/tests/Ticket/1441TestCase.php
index b0fe4a69a..415f6c8c7 100644
--- a/tests/Ticket/1441TestCase.php
+++ b/tests/Ticket/1441TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_1441_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1449TestCase.php b/tests/Ticket/1449TestCase.php
index b48fc9a7e..e77101e93 100644
--- a/tests/Ticket/1449TestCase.php
+++ b/tests/Ticket/1449TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_1449_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1452TestCase.php b/tests/Ticket/1452TestCase.php
index 1a773df7b..118116b42 100644
--- a/tests/Ticket/1452TestCase.php
+++ b/tests/Ticket/1452TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_1452_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1454TestCase.php b/tests/Ticket/1454TestCase.php
index 95fda6697..2d0ae9d4e 100644
--- a/tests/Ticket/1454TestCase.php
+++ b/tests/Ticket/1454TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_1454_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1461TestCase.php b/tests/Ticket/1461TestCase.php
index 62c2de13e..f1c09e6fd 100644
--- a/tests/Ticket/1461TestCase.php
+++ b/tests/Ticket/1461TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_1461_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1464TestCase.php b/tests/Ticket/1464TestCase.php
index f19c8a17d..ff125359a 100644
--- a/tests/Ticket/1464TestCase.php
+++ b/tests/Ticket/1464TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_1464_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1465TestCase.php b/tests/Ticket/1465TestCase.php
index c949101c2..f6eb4c044 100644
--- a/tests/Ticket/1465TestCase.php
+++ b/tests/Ticket/1465TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_1465_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1467TestCase.php b/tests/Ticket/1467TestCase.php
index 244924d32..cb5d881b6 100644
--- a/tests/Ticket/1467TestCase.php
+++ b/tests/Ticket/1467TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_1467_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1480TestCase.php b/tests/Ticket/1480TestCase.php
index cdd14f502..562c6b489 100644
--- a/tests/Ticket/1480TestCase.php
+++ b/tests/Ticket/1480TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_1480_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1483TestCase.php b/tests/Ticket/1483TestCase.php
index f0dd9d6ba..b5d06d9a0 100644
--- a/tests/Ticket/1483TestCase.php
+++ b/tests/Ticket/1483TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_1483_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1488TestCase.php b/tests/Ticket/1488TestCase.php
index fb025e9b0..4e6d99c06 100644
--- a/tests/Ticket/1488TestCase.php
+++ b/tests/Ticket/1488TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_1488_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1494TestCase.php b/tests/Ticket/1494TestCase.php
index b935c73e6..de979aa22 100644
--- a/tests/Ticket/1494TestCase.php
+++ b/tests/Ticket/1494TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_1494_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1500TestCase.php b/tests/Ticket/1500TestCase.php
index c6184ccd7..a2c93715d 100644
--- a/tests/Ticket/1500TestCase.php
+++ b/tests/Ticket/1500TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_1500_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1507TestCase.php b/tests/Ticket/1507TestCase.php
index 366d630cb..791663927 100644
--- a/tests/Ticket/1507TestCase.php
+++ b/tests/Ticket/1507TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_1500_TestCase.
  *
  * @author      David Zülke <david.zuelke@bitextender.com>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    ?
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1513TestCase.php b/tests/Ticket/1513TestCase.php
index 0dbb49679..aaab55b69 100644
--- a/tests/Ticket/1513TestCase.php
+++ b/tests/Ticket/1513TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_1513_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1520TestCase.php b/tests/Ticket/1520TestCase.php
index 3c3b79ae2..38ba58134 100644
--- a/tests/Ticket/1520TestCase.php
+++ b/tests/Ticket/1520TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_1520_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1522TestCase.php b/tests/Ticket/1522TestCase.php
index d60eab962..d59a219b3 100644
--- a/tests/Ticket/1522TestCase.php
+++ b/tests/Ticket/1522TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_1522_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1523TestCase.php b/tests/Ticket/1523TestCase.php
index 751ba7985..b72d208b0 100644
--- a/tests/Ticket/1523TestCase.php
+++ b/tests/Ticket/1523TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_1523_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1524TestCase.php b/tests/Ticket/1524TestCase.php
index 42a277a58..e3d31d9a3 100644
--- a/tests/Ticket/1524TestCase.php
+++ b/tests/Ticket/1524TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_1524_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1527TestCase.php b/tests/Ticket/1527TestCase.php
index 02f693301..e8602b006 100644
--- a/tests/Ticket/1527TestCase.php
+++ b/tests/Ticket/1527TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_1527_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1537TestCase.php b/tests/Ticket/1537TestCase.php
index 9ffc186ce..9fcaacb1a 100644
--- a/tests/Ticket/1537TestCase.php
+++ b/tests/Ticket/1537TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_1537_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1540TestCase.php b/tests/Ticket/1540TestCase.php
index 952dbe801..b507708d5 100644
--- a/tests/Ticket/1540TestCase.php
+++ b/tests/Ticket/1540TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_1540_TestCase.
  *
  * @author      Andrea Baron <andrea@bhweb.it>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0.2
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1543TestCase.php b/tests/Ticket/1543TestCase.php
index c5be59772..05f76eac4 100644
--- a/tests/Ticket/1543TestCase.php
+++ b/tests/Ticket/1543TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_1543_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1545TestCase.php b/tests/Ticket/1545TestCase.php
index 485892c3f..d4ef1f79c 100644
--- a/tests/Ticket/1545TestCase.php
+++ b/tests/Ticket/1545TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_1545_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1558TestCase.php b/tests/Ticket/1558TestCase.php
index dceb6cf3a..f768e9e32 100644
--- a/tests/Ticket/1558TestCase.php
+++ b/tests/Ticket/1558TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_1558_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1562TestCase.php b/tests/Ticket/1562TestCase.php
index 53da029a4..1b11c4953 100644
--- a/tests/Ticket/1562TestCase.php
+++ b/tests/Ticket/1562TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_1562_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1567TestCase.php b/tests/Ticket/1567TestCase.php
index 0c0aeeff2..4dfa50b36 100644
--- a/tests/Ticket/1567TestCase.php
+++ b/tests/Ticket/1567TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_1567_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1604TestCase.php b/tests/Ticket/1604TestCase.php
index 296041c5e..c37c2e486 100644
--- a/tests/Ticket/1604TestCase.php
+++ b/tests/Ticket/1604TestCase.php
@@ -22,14 +22,9 @@
 /**
  * Doctrine_Ticket_1589_TestCase.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1617TestCase.php b/tests/Ticket/1617TestCase.php
index 1cda03ef1..1f3013b7d 100644
--- a/tests/Ticket/1617TestCase.php
+++ b/tests/Ticket/1617TestCase.php
@@ -22,14 +22,9 @@
 /**
  * Doctrine_Ticket_1617_TestCase.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.1
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1619TestCase.php b/tests/Ticket/1619TestCase.php
index a3b861147..b8223a87d 100644
--- a/tests/Ticket/1619TestCase.php
+++ b/tests/Ticket/1619TestCase.php
@@ -22,14 +22,9 @@
 /**
  * Doctrine_Ticket_1619_TestCase.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1621TestCase.php b/tests/Ticket/1621TestCase.php
index ee48e8bdb..1414bf7ce 100644
--- a/tests/Ticket/1621TestCase.php
+++ b/tests/Ticket/1621TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_1621_TestCase.
  *
  * @author      floriank
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.1
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1621bTestCase.php b/tests/Ticket/1621bTestCase.php
index b8f5ad575..9dc7983de 100644
--- a/tests/Ticket/1621bTestCase.php
+++ b/tests/Ticket/1621bTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_1621b_TestCase.
  *
  * @author      floriank
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.1
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1622TestCase.php b/tests/Ticket/1622TestCase.php
index 65c1f4b2c..bcbead7af 100644
--- a/tests/Ticket/1622TestCase.php
+++ b/tests/Ticket/1622TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_1622_TestCase.
  *
  * @author      floriank
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.1
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1623TestCase.php b/tests/Ticket/1623TestCase.php
index 9d1d88339..13e13643b 100644
--- a/tests/Ticket/1623TestCase.php
+++ b/tests/Ticket/1623TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_1623_TestCase.
  *
  * @author      floriank
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.1
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1628TestCase.php b/tests/Ticket/1628TestCase.php
index 120145fcb..2bf496916 100644
--- a/tests/Ticket/1628TestCase.php
+++ b/tests/Ticket/1628TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_1628_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1629TestCase.php b/tests/Ticket/1629TestCase.php
index 7f60f84c2..be137694e 100644
--- a/tests/Ticket/1629TestCase.php
+++ b/tests/Ticket/1629TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_1629_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1630TestCase.php b/tests/Ticket/1630TestCase.php
index e0fcbcbb7..8ed8123c4 100644
--- a/tests/Ticket/1630TestCase.php
+++ b/tests/Ticket/1630TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_1630_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1636TestCase.php b/tests/Ticket/1636TestCase.php
index 7e7cac551..7b8c47823 100644
--- a/tests/Ticket/1636TestCase.php
+++ b/tests/Ticket/1636TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_1636_TestCase.
  *
  * @author      Eugene Janusov <esycat@gmail.com>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1641TestCase.php b/tests/Ticket/1641TestCase.php
index 418e34f6b..bb0589c67 100644
--- a/tests/Ticket/1641TestCase.php
+++ b/tests/Ticket/1641TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_1641_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1652TestCase.php b/tests/Ticket/1652TestCase.php
index d71801512..3efbf043b 100644
--- a/tests/Ticket/1652TestCase.php
+++ b/tests/Ticket/1652TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_1652_TestCase.
  *
  * @author      floriank
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.1
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1653TestCase.php b/tests/Ticket/1653TestCase.php
index e177d8146..59e2f5e6f 100644
--- a/tests/Ticket/1653TestCase.php
+++ b/tests/Ticket/1653TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_1653_TestCase.
  *
  * @author      floriank
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.1
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1658TestCase.php b/tests/Ticket/1658TestCase.php
index 0a3e08773..c3004bd1b 100644
--- a/tests/Ticket/1658TestCase.php
+++ b/tests/Ticket/1658TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_1658_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1674TestCase.php b/tests/Ticket/1674TestCase.php
index 87b14799a..74d55ba62 100644
--- a/tests/Ticket/1674TestCase.php
+++ b/tests/Ticket/1674TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_1674_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1703TestCase.php b/tests/Ticket/1703TestCase.php
index f146d4aa1..a919de12c 100644
--- a/tests/Ticket/1703TestCase.php
+++ b/tests/Ticket/1703TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Template_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1706TestCase.php b/tests/Ticket/1706TestCase.php
index 5deff1627..a79a8abb2 100644
--- a/tests/Ticket/1706TestCase.php
+++ b/tests/Ticket/1706TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_1706_TestCase.
  *
  * @author      David Abdemoulaie <doctrine@hobodave.com>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1716TestCase.php b/tests/Ticket/1716TestCase.php
index 6c3075bb4..9cc6103da 100644
--- a/tests/Ticket/1716TestCase.php
+++ b/tests/Ticket/1716TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_1716_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1725TestCase.php b/tests/Ticket/1725TestCase.php
index f551e3254..1610df186 100644
--- a/tests/Ticket/1725TestCase.php
+++ b/tests/Ticket/1725TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_1725_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1727TestCase.php b/tests/Ticket/1727TestCase.php
index 6b9c0cfde..678e2e79a 100644
--- a/tests/Ticket/1727TestCase.php
+++ b/tests/Ticket/1727TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_1727_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1729TestCase.php b/tests/Ticket/1729TestCase.php
index f4e862930..4d13fb39a 100644
--- a/tests/Ticket/1729TestCase.php
+++ b/tests/Ticket/1729TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_1729_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1745TestCase.php b/tests/Ticket/1745TestCase.php
index a12c6e2e8..e5b2c5f26 100644
--- a/tests/Ticket/1745TestCase.php
+++ b/tests/Ticket/1745TestCase.php
@@ -22,14 +22,9 @@
 /**
  * Doctrine_Ticket_1745_TestCase.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1762TestCase.php b/tests/Ticket/1762TestCase.php
index cbd614ec8..c3bd03740 100644
--- a/tests/Ticket/1762TestCase.php
+++ b/tests/Ticket/1762TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_1762_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1763TestCase.php b/tests/Ticket/1763TestCase.php
index 2878dd244..23ec76e18 100644
--- a/tests/Ticket/1763TestCase.php
+++ b/tests/Ticket/1763TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_1763_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1764TestCase.php b/tests/Ticket/1764TestCase.php
index 92cfb0640..03b8263aa 100644
--- a/tests/Ticket/1764TestCase.php
+++ b/tests/Ticket/1764TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_1764_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1793TestCase.php b/tests/Ticket/1793TestCase.php
index 9a8cf62bb..eaccc30b0 100644
--- a/tests/Ticket/1793TestCase.php
+++ b/tests/Ticket/1793TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_1793_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1795TestCase.php b/tests/Ticket/1795TestCase.php
index 5ab0e5491..322d2d4a2 100644
--- a/tests/Ticket/1795TestCase.php
+++ b/tests/Ticket/1795TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_1795_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1799TestCase.php b/tests/Ticket/1799TestCase.php
index e704c14a3..3fdb5a179 100644
--- a/tests/Ticket/1799TestCase.php
+++ b/tests/Ticket/1799TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_1799_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1808TestCase.php b/tests/Ticket/1808TestCase.php
index 24e0dc21f..9d4d30886 100644
--- a/tests/Ticket/1808TestCase.php
+++ b/tests/Ticket/1808TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_1808_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1818TestCase.php b/tests/Ticket/1818TestCase.php
index ff7cf06b4..083fc2cc0 100644
--- a/tests/Ticket/1818TestCase.php
+++ b/tests/Ticket/1818TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_1818_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1821TestCase.php b/tests/Ticket/1821TestCase.php
index 02d2fcd30..933cda5d2 100644
--- a/tests/Ticket/1821TestCase.php
+++ b/tests/Ticket/1821TestCase.php
@@ -22,14 +22,9 @@
 /**
  * Doctrine_Ticket_1821_TestCase.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @author      Andrea Baron <andrea@bhweb.it>
  *
diff --git a/tests/Ticket/1824TestCase.php b/tests/Ticket/1824TestCase.php
index d212b1097..24bc95a94 100644
--- a/tests/Ticket/1824TestCase.php
+++ b/tests/Ticket/1824TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_1824_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1841TestCase.php b/tests/Ticket/1841TestCase.php
index 19a733b95..676d69b70 100644
--- a/tests/Ticket/1841TestCase.php
+++ b/tests/Ticket/1841TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_1841_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1843TestCase.php b/tests/Ticket/1843TestCase.php
index 9a1e65693..26ba42181 100644
--- a/tests/Ticket/1843TestCase.php
+++ b/tests/Ticket/1843TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_1843_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1858TestCase.php b/tests/Ticket/1858TestCase.php
index ff6db4a14..2bc0801d2 100644
--- a/tests/Ticket/1858TestCase.php
+++ b/tests/Ticket/1858TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_1858_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1860TestCase.php b/tests/Ticket/1860TestCase.php
index 2925055a4..2606222c6 100644
--- a/tests/Ticket/1860TestCase.php
+++ b/tests/Ticket/1860TestCase.php
@@ -22,14 +22,9 @@
 /**
  * Doctrine_Ticket_1860_TestCase.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1865TestCase.php b/tests/Ticket/1865TestCase.php
index e86a190f7..44908c51e 100644
--- a/tests/Ticket/1865TestCase.php
+++ b/tests/Ticket/1865TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_1865_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1875TestCase.php b/tests/Ticket/1875TestCase.php
index 5a1f73f04..b67a7f9bb 100644
--- a/tests/Ticket/1875TestCase.php
+++ b/tests/Ticket/1875TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_1875_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1876TestCase.php b/tests/Ticket/1876TestCase.php
index dcd1ff27a..63729f01e 100644
--- a/tests/Ticket/1876TestCase.php
+++ b/tests/Ticket/1876TestCase.php
@@ -22,14 +22,9 @@
 /**
  * Doctrine_Ticket_1821_TestCase.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @author      Andrea Baron <andrea@bhweb.it>
  *
diff --git a/tests/Ticket/1923TestCase.php b/tests/Ticket/1923TestCase.php
index 32bfa2ffd..d748c0b62 100644
--- a/tests/Ticket/1923TestCase.php
+++ b/tests/Ticket/1923TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_1923_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1940TestCase.php b/tests/Ticket/1940TestCase.php
index 1f77fc930..a1f06194f 100644
--- a/tests/Ticket/1940TestCase.php
+++ b/tests/Ticket/1940TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_1940_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1958TestCase.php b/tests/Ticket/1958TestCase.php
index 7cbebff05..807e36907 100644
--- a/tests/Ticket/1958TestCase.php
+++ b/tests/Ticket/1958TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_1958_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1986TestCase.php b/tests/Ticket/1986TestCase.php
index 3c56d7c22..c0fed8615 100644
--- a/tests/Ticket/1986TestCase.php
+++ b/tests/Ticket/1986TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_1986_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1991TestCase.php b/tests/Ticket/1991TestCase.php
index 886a13943..7a2dfad28 100644
--- a/tests/Ticket/1991TestCase.php
+++ b/tests/Ticket/1991TestCase.php
@@ -22,14 +22,9 @@
 /**
  * Doctrine_Ticket_1015_TestCase.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/1992TestCase.php b/tests/Ticket/1992TestCase.php
index 2a9eb8e68..56c45eb24 100644
--- a/tests/Ticket/1992TestCase.php
+++ b/tests/Ticket/1992TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_1992_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/2007TestCase.php b/tests/Ticket/2007TestCase.php
index 3dae905de..4a88e10b7 100644
--- a/tests/Ticket/2007TestCase.php
+++ b/tests/Ticket/2007TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_2007_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/2015TestCase.php b/tests/Ticket/2015TestCase.php
index 28c63d1f5..5ccf2a887 100644
--- a/tests/Ticket/2015TestCase.php
+++ b/tests/Ticket/2015TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_2015_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/2032TestCase.php b/tests/Ticket/2032TestCase.php
index 72fc920f4..4fcc55abd 100644
--- a/tests/Ticket/2032TestCase.php
+++ b/tests/Ticket/2032TestCase.php
@@ -23,14 +23,9 @@
 /**
  * Doctrine_Ticket_2032_TestCase.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.1
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/2105TestCase.php b/tests/Ticket/2105TestCase.php
index 18297d9be..2f5a65056 100644
--- a/tests/Ticket/2105TestCase.php
+++ b/tests/Ticket/2105TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_2105_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/2123TestCase.php b/tests/Ticket/2123TestCase.php
index ee7c4dacd..ba9e730f9 100644
--- a/tests/Ticket/2123TestCase.php
+++ b/tests/Ticket/2123TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_2123_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/2159TestCase.php b/tests/Ticket/2159TestCase.php
index ef03d580f..d31c7d81a 100644
--- a/tests/Ticket/2159TestCase.php
+++ b/tests/Ticket/2159TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_2159_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/2160TestCase.php b/tests/Ticket/2160TestCase.php
index 5a1da5250..54522ce85 100644
--- a/tests/Ticket/2160TestCase.php
+++ b/tests/Ticket/2160TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_2160_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/2184TestCase.php b/tests/Ticket/2184TestCase.php
index 21327fec4..eddc1a69b 100644
--- a/tests/Ticket/2184TestCase.php
+++ b/tests/Ticket/2184TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_2184_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/2190TestCase.php b/tests/Ticket/2190TestCase.php
index 7d98a3cb1..b21d8041b 100644
--- a/tests/Ticket/2190TestCase.php
+++ b/tests/Ticket/2190TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_2190_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/2204TestCase.php b/tests/Ticket/2204TestCase.php
index a61815adc..5a59d8e56 100644
--- a/tests/Ticket/2204TestCase.php
+++ b/tests/Ticket/2204TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_2204_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/2229TestCase.php b/tests/Ticket/2229TestCase.php
index 48a60bffb..ef06fe702 100644
--- a/tests/Ticket/2229TestCase.php
+++ b/tests/Ticket/2229TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_2xxx_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/2251TestCase.php b/tests/Ticket/2251TestCase.php
index 4bf614137..a006640f3 100644
--- a/tests/Ticket/2251TestCase.php
+++ b/tests/Ticket/2251TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_2251_TestCase.
  *
  * @author          Daniel Cousineau <dcousineau@gmail.com>
- * @license         http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category        Object Relational Mapping
  *
  * @see            www.doctrine-project.org
- * @since           1.0
- *
- * @version         $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/2292TestCase.php b/tests/Ticket/2292TestCase.php
index 29c054c30..a2909e22b 100644
--- a/tests/Ticket/2292TestCase.php
+++ b/tests/Ticket/2292TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_2292_TestCase.
  *
  * @author      Miloslav Kmeť <miloslav.kmet@gmail.com>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/2295TestCase.php b/tests/Ticket/2295TestCase.php
index fc876ec12..1937271ba 100644
--- a/tests/Ticket/2295TestCase.php
+++ b/tests/Ticket/2295TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_2295_TestCase.
  *
  * @author      Miloslav Kmeť <miloslav.kmet@gmail.com>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/2334TestCase.php b/tests/Ticket/2334TestCase.php
index 41512dbf6..51352be19 100644
--- a/tests/Ticket/2334TestCase.php
+++ b/tests/Ticket/2334TestCase.php
@@ -23,14 +23,10 @@
  * Ticket_2334_TestMSSQLUnsignedInt.
  *
  * @author          Daniel Cousineau <dcousineau@gmail.com>
- * @license         http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category        Object Relational Mapping
  *
  * @see            www.doctrine-project.org
- * @since           1.0
- *
- * @version         $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/2355TestCase.php b/tests/Ticket/2355TestCase.php
index 406e2e8ef..33e6cf726 100644
--- a/tests/Ticket/2355TestCase.php
+++ b/tests/Ticket/2355TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_2355_TestCase.
  *
  * @author      Fabien Pennequin <fabien.pennequin@gmail.com>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/2367TestCase.php b/tests/Ticket/2367TestCase.php
index 1565b6577..b452474c8 100644
--- a/tests/Ticket/2367TestCase.php
+++ b/tests/Ticket/2367TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_2367_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/2375TestCase.php b/tests/Ticket/2375TestCase.php
index aeaf9f5da..2b3880d8a 100644
--- a/tests/Ticket/2375TestCase.php
+++ b/tests/Ticket/2375TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_2375_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/2377TestCase.php b/tests/Ticket/2377TestCase.php
index 67bc584ae..80dd4d8f2 100644
--- a/tests/Ticket/2377TestCase.php
+++ b/tests/Ticket/2377TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_2355_TestCase.
  *
  * @author      Jacek Dębowczyk <j.debowczyk@diface.com>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.1
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/2398TestCase.php b/tests/Ticket/2398TestCase.php
index 74d4a4008..d6ecfe409 100644
--- a/tests/Ticket/2398TestCase.php
+++ b/tests/Ticket/2398TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_1015_TestCase.
  *
  * @author      Russ Flynn <russ@eatmymonkeydust.com>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/255TestCase.php b/tests/Ticket/255TestCase.php
index e4f3df4fc..0efe4a797 100644
--- a/tests/Ticket/255TestCase.php
+++ b/tests/Ticket/255TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_255_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/381TestCase.php b/tests/Ticket/381TestCase.php
index 4bf5cb99e..87600f4e4 100644
--- a/tests/Ticket/381TestCase.php
+++ b/tests/Ticket/381TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket381_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/384TestCase.php b/tests/Ticket/384TestCase.php
index 54b322d18..b53a32979 100644
--- a/tests/Ticket/384TestCase.php
+++ b/tests/Ticket/384TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_384_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/424BTestCase.php b/tests/Ticket/424BTestCase.php
index e2339884e..53da071d7 100644
--- a/tests/Ticket/424BTestCase.php
+++ b/tests/Ticket/424BTestCase.php
@@ -25,14 +25,10 @@
  * This test case tests many-many relationship with non-autoincrement primary key
  *
  * @author      Tamcy <7am.online@gmail.com>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/424CTestCase.php b/tests/Ticket/424CTestCase.php
index 577506bd7..1655329da 100644
--- a/tests/Ticket/424CTestCase.php
+++ b/tests/Ticket/424CTestCase.php
@@ -25,14 +25,10 @@
  * This test case tests many-many relationship with non-autoincrement, alias primary key
  *
  * @author      Tamcy <7am.online@gmail.com>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/428TestCase.php b/tests/Ticket/428TestCase.php
index 43237f55a..82ae2b193 100644
--- a/tests/Ticket/428TestCase.php
+++ b/tests/Ticket/428TestCase.php
@@ -4,14 +4,10 @@
  * Doctrine_Ticket_428_TestCase.
  *
  * @author      Tamcy <7am.online@gmail.com>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/438TestCase.php b/tests/Ticket/438TestCase.php
index 88ad1be61..28c520bb2 100644
--- a/tests/Ticket/438TestCase.php
+++ b/tests/Ticket/438TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_438_TestCase.
  *
  * @author      Tamcy <7am.online@gmail.com>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/480TestCase.php b/tests/Ticket/480TestCase.php
index 08b19611d..7a478a7ca 100644
--- a/tests/Ticket/480TestCase.php
+++ b/tests/Ticket/480TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_480_TestCase.
  *
  * @author      Miloslav Kmet <adrive-nospam@hip-hop.sk>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  */
 class stComment extends Doctrine_Record
 {
diff --git a/tests/Ticket/486TestCase.php b/tests/Ticket/486TestCase.php
index 5c541fd0c..bad34d705 100755
--- a/tests/Ticket/486TestCase.php
+++ b/tests/Ticket/486TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_486_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/565TestCase.php b/tests/Ticket/565TestCase.php
index c6f3c0b76..263ead11c 100644
--- a/tests/Ticket/565TestCase.php
+++ b/tests/Ticket/565TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_565_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/574TestCase.php b/tests/Ticket/574TestCase.php
index bb88351ac..841556c30 100644
--- a/tests/Ticket/574TestCase.php
+++ b/tests/Ticket/574TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_574_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/576TestCase.php b/tests/Ticket/576TestCase.php
index ac75599b4..c2aff52c3 100644
--- a/tests/Ticket/576TestCase.php
+++ b/tests/Ticket/576TestCase.php
@@ -4,14 +4,10 @@
  * Doctrine_Ticket_587_TestCase.
  *
  * @author      Joaquin Bravo <jackbravo@gmail.com>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/583TestCase.php b/tests/Ticket/583TestCase.php
index e4afed7f4..7788dc329 100644
--- a/tests/Ticket/583TestCase.php
+++ b/tests/Ticket/583TestCase.php
@@ -4,14 +4,10 @@
  * Doctrine_Ticket_587_TestCase.
  *
  * @author      Joaquin Bravo <jackbravo@gmail.com>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/587TestCase.php b/tests/Ticket/587TestCase.php
index 91bf819c6..38751e37d 100644
--- a/tests/Ticket/587TestCase.php
+++ b/tests/Ticket/587TestCase.php
@@ -4,14 +4,10 @@
  * Doctrine_Ticket_587_TestCase.
  *
  * @author      David Brewer <dbrewer@secondstory.com>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/626BTestCase.php b/tests/Ticket/626BTestCase.php
index 8b4db693c..253842bff 100644
--- a/tests/Ticket/626BTestCase.php
+++ b/tests/Ticket/626BTestCase.php
@@ -4,14 +4,10 @@
  * Doctrine_Ticket_626_TestCase.
  *
  * @author      Tamcy <7am.online@gmail.com>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/626CTestCase.php b/tests/Ticket/626CTestCase.php
index 7445fcce1..82c8a2174 100644
--- a/tests/Ticket/626CTestCase.php
+++ b/tests/Ticket/626CTestCase.php
@@ -4,14 +4,10 @@
  * Doctrine_Ticket_626_TestCase.
  *
  * @author      Tamcy <7am.online@gmail.com>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/626DTestCase.php b/tests/Ticket/626DTestCase.php
index 7a3da77c3..fe90561ec 100644
--- a/tests/Ticket/626DTestCase.php
+++ b/tests/Ticket/626DTestCase.php
@@ -4,14 +4,10 @@
  * Doctrine_Ticket_626D_TestCase.
  *
  * @author      Tamcy <7am.online@gmail.com>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/632TestCase.php b/tests/Ticket/632TestCase.php
index c51b804bb..632f5145c 100644
--- a/tests/Ticket/632TestCase.php
+++ b/tests/Ticket/632TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_632_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/638TestCase.php b/tests/Ticket/638TestCase.php
index 9dfbb49e3..92cca568b 100644
--- a/tests/Ticket/638TestCase.php
+++ b/tests/Ticket/638TestCase.php
@@ -4,14 +4,10 @@
  * Doctrine_Ticket_638_TestCase.
  *
  * @author      Tamcy <7am.online@gmail.com>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/642TestCase.php b/tests/Ticket/642TestCase.php
index a729ba431..97beee370 100644
--- a/tests/Ticket/642TestCase.php
+++ b/tests/Ticket/642TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_642_TestCase.
  *
  * @author      Guilherme Blanco <guilhermeblanco@hotmail.com>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/668TestCase.php b/tests/Ticket/668TestCase.php
index 683897163..fd9fecb38 100755
--- a/tests/Ticket/668TestCase.php
+++ b/tests/Ticket/668TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_668_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/673TestCase.php b/tests/Ticket/673TestCase.php
index 63e41b371..984d12fd6 100644
--- a/tests/Ticket/673TestCase.php
+++ b/tests/Ticket/673TestCase.php
@@ -4,14 +4,10 @@
  * Doctrine_Ticket_673_TestCase.
  *
  * @author      Tamcy <7am.online@gmail.com>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/697TestCase.php b/tests/Ticket/697TestCase.php
index 5d43fde12..6101c5186 100644
--- a/tests/Ticket/697TestCase.php
+++ b/tests/Ticket/697TestCase.php
@@ -2,14 +2,9 @@
 /**
  * Doctrine_Ticket_697_TestCase.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/736TestCase.php b/tests/Ticket/736TestCase.php
index 114a9cec7..b923bd756 100644
--- a/tests/Ticket/736TestCase.php
+++ b/tests/Ticket/736TestCase.php
@@ -8,8 +8,6 @@
  *
  * @see        www.doctrine-project.org
  *
- * @version     $Revision$
- *
  * @internal
  *
  * @coversNothing
diff --git a/tests/Ticket/749TestCase.php b/tests/Ticket/749TestCase.php
index 6ebf0f11a..2fae70286 100644
--- a/tests/Ticket/749TestCase.php
+++ b/tests/Ticket/749TestCase.php
@@ -3,25 +3,10 @@
  * Doctrine_Ticket_749_TestCase.
  *
  * @author      David Brewer <dbrewer@secondstory.com>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
- *
- * This test case demonstrates a problem with column aggregation inheritance
- * in Doctrine 0.9. The high level summary is that it is possible to make
- * it work in general -- if class B is a subclass of class A, you can select
- * from class A and get back objects of class B.  However, those objects do
- * not have the related objects of class B, and in fact an exception is
- * thrown when you try to access those related objects.
- *
- * This test case should not probably be applied to trunk and possibly not
- * to 0.10 branch.  I'm not sure it's even possible to fix in 0.9 but it is
- * an issue that keeps arising for me so it seemed worth a test case.
  *
  * @internal
  *
diff --git a/tests/Ticket/753TestCase.php b/tests/Ticket/753TestCase.php
index dcb9798e1..eff1c49e2 100644
--- a/tests/Ticket/753TestCase.php
+++ b/tests/Ticket/753TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_753_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/7745TestCase.php b/tests/Ticket/7745TestCase.php
index 8e1b15bd2..5be3a807f 100644
--- a/tests/Ticket/7745TestCase.php
+++ b/tests/Ticket/7745TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_7745_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/786TestCase.php b/tests/Ticket/786TestCase.php
index 64949a773..80b451e5d 100644
--- a/tests/Ticket/786TestCase.php
+++ b/tests/Ticket/786TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_786_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/832TestCase.php b/tests/Ticket/832TestCase.php
index 53d7a25a1..b5957504c 100644
--- a/tests/Ticket/832TestCase.php
+++ b/tests/Ticket/832TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_832_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/838TestCase.php b/tests/Ticket/838TestCase.php
index 426062a84..fc8dd0707 100644
--- a/tests/Ticket/838TestCase.php
+++ b/tests/Ticket/838TestCase.php
@@ -3,14 +3,11 @@
  * Doctrine_Ticket_838_TestCase.
  *
  * @author      Jani Hartikainen <firstname at codeutopia net>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
  *
- * @version     $Revision$
- *
  * @internal
  *
  * @coversNothing
diff --git a/tests/Ticket/867TestCase.php b/tests/Ticket/867TestCase.php
index a162c23f9..6fa7ae3d1 100644
--- a/tests/Ticket/867TestCase.php
+++ b/tests/Ticket/867TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_867_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/876TestCase.php b/tests/Ticket/876TestCase.php
index 674a427a4..9a8d4dadb 100644
--- a/tests/Ticket/876TestCase.php
+++ b/tests/Ticket/876TestCase.php
@@ -3,14 +3,10 @@
  * Doctrine_Ticket_SegmentationFault_TestCase.
  *
  * @author      Tiago Ribeiro <tiago.ribeiro@gmail.com>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/889TestCase.php b/tests/Ticket/889TestCase.php
index 4b60f5c52..b2b207781 100644
--- a/tests/Ticket/889TestCase.php
+++ b/tests/Ticket/889TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_889_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/894TestCase.php b/tests/Ticket/894TestCase.php
index 31761b098..fcba3f789 100644
--- a/tests/Ticket/894TestCase.php
+++ b/tests/Ticket/894TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_894_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/904TestCase.php b/tests/Ticket/904TestCase.php
index 99f8d250c..4192ca691 100644
--- a/tests/Ticket/904TestCase.php
+++ b/tests/Ticket/904TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_904_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/912TestCase.php b/tests/Ticket/912TestCase.php
index b9f835755..20a362b79 100644
--- a/tests/Ticket/912TestCase.php
+++ b/tests/Ticket/912TestCase.php
@@ -27,9 +27,6 @@
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/915TestCase.php b/tests/Ticket/915TestCase.php
index a34540298..2f03909f4 100644
--- a/tests/Ticket/915TestCase.php
+++ b/tests/Ticket/915TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_915_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/923TestCase.php b/tests/Ticket/923TestCase.php
index 71da16308..7e8ede946 100644
--- a/tests/Ticket/923TestCase.php
+++ b/tests/Ticket/923TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket923_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/927TestCase.php b/tests/Ticket/927TestCase.php
index 67dcd1edc..0d91919a0 100644
--- a/tests/Ticket/927TestCase.php
+++ b/tests/Ticket/927TestCase.php
@@ -27,9 +27,6 @@
  * @category    Query
  *
  * @see        www.doctrine-project.org
- * @since       0.10.4
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/929TestCase.php b/tests/Ticket/929TestCase.php
index ed5b686e1..44ecd35aa 100644
--- a/tests/Ticket/929TestCase.php
+++ b/tests/Ticket/929TestCase.php
@@ -27,9 +27,6 @@
  * @category    Hydration
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/930TestCase.php b/tests/Ticket/930TestCase.php
index b3e3e5513..cee95e626 100644
--- a/tests/Ticket/930TestCase.php
+++ b/tests/Ticket/930TestCase.php
@@ -27,9 +27,6 @@
  * @category    Hydration
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/935TestCase.php b/tests/Ticket/935TestCase.php
index 11a6e0ca5..b8721bba5 100644
--- a/tests/Ticket/935TestCase.php
+++ b/tests/Ticket/935TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket935_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/950TestCase.php b/tests/Ticket/950TestCase.php
index 8b8ef61b0..0da6f3356 100755
--- a/tests/Ticket/950TestCase.php
+++ b/tests/Ticket/950TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_950_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/952TestCase.php b/tests/Ticket/952TestCase.php
index 65c861921..e0d1eea2f 100644
--- a/tests/Ticket/952TestCase.php
+++ b/tests/Ticket/952TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_952_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/963TestCase.php b/tests/Ticket/963TestCase.php
index 877ccdd36..391a3db46 100644
--- a/tests/Ticket/963TestCase.php
+++ b/tests/Ticket/963TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_963_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/969TestCase.php b/tests/Ticket/969TestCase.php
index 6947f1053..38ae3fd39 100644
--- a/tests/Ticket/969TestCase.php
+++ b/tests/Ticket/969TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_969_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/973TestCase.php b/tests/Ticket/973TestCase.php
index a6188aeb2..da9d681d1 100755
--- a/tests/Ticket/973TestCase.php
+++ b/tests/Ticket/973TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_973_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/987TestCase.php b/tests/Ticket/987TestCase.php
index a6b54920c..fa227b396 100644
--- a/tests/Ticket/987TestCase.php
+++ b/tests/Ticket/987TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_987_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/990TestCase.php b/tests/Ticket/990TestCase.php
index d0e165de7..2b386410a 100644
--- a/tests/Ticket/990TestCase.php
+++ b/tests/Ticket/990TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_990_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/AyoubTestCase.php b/tests/Ticket/AyoubTestCase.php
index f33f4e16d..abec20fe9 100644
--- a/tests/Ticket/AyoubTestCase.php
+++ b/tests/Ticket/AyoubTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_Ayoub_TestCase.
  *
  * @author      pascal borreli
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/DC101TestCase.php b/tests/Ticket/DC101TestCase.php
index 566d17118..e3a61e7ba 100644
--- a/tests/Ticket/DC101TestCase.php
+++ b/tests/Ticket/DC101TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_DC101_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/DC112TestCase.php b/tests/Ticket/DC112TestCase.php
index 699c365ad..95fbe35b3 100644
--- a/tests/Ticket/DC112TestCase.php
+++ b/tests/Ticket/DC112TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_DDC47_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/DC136TestCase.php b/tests/Ticket/DC136TestCase.php
index c43d1a5e5..ad3224fe4 100644
--- a/tests/Ticket/DC136TestCase.php
+++ b/tests/Ticket/DC136TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_DC136_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/DC141TestCase.php b/tests/Ticket/DC141TestCase.php
index 093e49207..8ce6fe720 100644
--- a/tests/Ticket/DC141TestCase.php
+++ b/tests/Ticket/DC141TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_DC141_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/DC147TestCase.php b/tests/Ticket/DC147TestCase.php
index 50848414b..83b37c890 100644
--- a/tests/Ticket/DC147TestCase.php
+++ b/tests/Ticket/DC147TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_DC147_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/DC14TestCase.php b/tests/Ticket/DC14TestCase.php
index 51f70844b..69d88028f 100644
--- a/tests/Ticket/DC14TestCase.php
+++ b/tests/Ticket/DC14TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_DC14_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/DC169TestCase.php b/tests/Ticket/DC169TestCase.php
index 7325f749c..b1d4479b4 100644
--- a/tests/Ticket/DC169TestCase.php
+++ b/tests/Ticket/DC169TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_DC169_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/DC171TestCase.php b/tests/Ticket/DC171TestCase.php
index 08d0384c9..ea1fb906c 100644
--- a/tests/Ticket/DC171TestCase.php
+++ b/tests/Ticket/DC171TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_DC171_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/DC187TestCase.php b/tests/Ticket/DC187TestCase.php
index 8007b9886..43d93363e 100644
--- a/tests/Ticket/DC187TestCase.php
+++ b/tests/Ticket/DC187TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_DC187_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/DC198TestCase.php b/tests/Ticket/DC198TestCase.php
index a51d24abe..58a053435 100644
--- a/tests/Ticket/DC198TestCase.php
+++ b/tests/Ticket/DC198TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_DC198_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/DC217TestCase.php b/tests/Ticket/DC217TestCase.php
index b18fe3dcc..817a2cd62 100644
--- a/tests/Ticket/DC217TestCase.php
+++ b/tests/Ticket/DC217TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_DC217_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/DC221TestCase.php b/tests/Ticket/DC221TestCase.php
index bcaee791d..b75aba647 100644
--- a/tests/Ticket/DC221TestCase.php
+++ b/tests/Ticket/DC221TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_DC221_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/DC236TestCase.php b/tests/Ticket/DC236TestCase.php
index aaf8d47d3..e268e703f 100644
--- a/tests/Ticket/DC236TestCase.php
+++ b/tests/Ticket/DC236TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_DC236_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/DC238TestCase.php b/tests/Ticket/DC238TestCase.php
index 296022e17..fe094b2bb 100644
--- a/tests/Ticket/DC238TestCase.php
+++ b/tests/Ticket/DC238TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_DC238_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/DC23TestCase.php b/tests/Ticket/DC23TestCase.php
index 8085b6a58..21dcd04bf 100644
--- a/tests/Ticket/DC23TestCase.php
+++ b/tests/Ticket/DC23TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_DC23_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/DC23bTestCase.php b/tests/Ticket/DC23bTestCase.php
index 04b02e37e..6a142c48c 100644
--- a/tests/Ticket/DC23bTestCase.php
+++ b/tests/Ticket/DC23bTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_DC23b_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/DC240TestCase.php b/tests/Ticket/DC240TestCase.php
index 1e09f6157..8ab483b23 100644
--- a/tests/Ticket/DC240TestCase.php
+++ b/tests/Ticket/DC240TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_DC240_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/DC241TestCase.php b/tests/Ticket/DC241TestCase.php
index 165044466..825899d14 100644
--- a/tests/Ticket/DC241TestCase.php
+++ b/tests/Ticket/DC241TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_DC241_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/DC242TestCase.php b/tests/Ticket/DC242TestCase.php
index 3c1e27824..28deb7465 100644
--- a/tests/Ticket/DC242TestCase.php
+++ b/tests/Ticket/DC242TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_DC242_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/DC24TestCase.php b/tests/Ticket/DC24TestCase.php
index 5a0d16f91..357af9e6c 100644
--- a/tests/Ticket/DC24TestCase.php
+++ b/tests/Ticket/DC24TestCase.php
@@ -24,14 +24,10 @@
  *
  * @author      Tomasz Jędrzejewski <http://www.zyxist.com/>
  * @author      Jacek Jędrzejewski <http://www.jacek.jedrzejewski.name/>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.1
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/DC25TestCase.php b/tests/Ticket/DC25TestCase.php
index 741c1b309..ca1f1fde6 100644
--- a/tests/Ticket/DC25TestCase.php
+++ b/tests/Ticket/DC25TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_DC25_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/DC266TestCase.php b/tests/Ticket/DC266TestCase.php
index b03231885..39e35302e 100644
--- a/tests/Ticket/DC266TestCase.php
+++ b/tests/Ticket/DC266TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_DC266_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/DC267TestCase.php b/tests/Ticket/DC267TestCase.php
index 7c1395d99..f8d664fbc 100644
--- a/tests/Ticket/DC267TestCase.php
+++ b/tests/Ticket/DC267TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_DC267_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/DC276TestCase.php b/tests/Ticket/DC276TestCase.php
index f6e8ceac8..d40573ec8 100644
--- a/tests/Ticket/DC276TestCase.php
+++ b/tests/Ticket/DC276TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_DC276_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/DC28TestCase.php b/tests/Ticket/DC28TestCase.php
index e3db23605..a937c0f15 100644
--- a/tests/Ticket/DC28TestCase.php
+++ b/tests/Ticket/DC28TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_DC28_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/DC292TestCase.php b/tests/Ticket/DC292TestCase.php
index 23c7416e6..c606b78df 100644
--- a/tests/Ticket/DC292TestCase.php
+++ b/tests/Ticket/DC292TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_DC292_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/DC300TestCase.php b/tests/Ticket/DC300TestCase.php
index a75e66973..1b104f7cc 100644
--- a/tests/Ticket/DC300TestCase.php
+++ b/tests/Ticket/DC300TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_DC300_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/DC302TestCase.php b/tests/Ticket/DC302TestCase.php
index 6dbe626e9..fbe3cdd94 100644
--- a/tests/Ticket/DC302TestCase.php
+++ b/tests/Ticket/DC302TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_DC302_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/DC317TestCase.php b/tests/Ticket/DC317TestCase.php
index 857308727..3f609ec33 100644
--- a/tests/Ticket/DC317TestCase.php
+++ b/tests/Ticket/DC317TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_DC317_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/DC36TestCase.php b/tests/Ticket/DC36TestCase.php
index 83d2b804d..5dfb1bafc 100644
--- a/tests/Ticket/DC36TestCase.php
+++ b/tests/Ticket/DC36TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_DC36_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/DC399TestCase.php b/tests/Ticket/DC399TestCase.php
index 62bfbfe0a..c2bc0b1df 100644
--- a/tests/Ticket/DC399TestCase.php
+++ b/tests/Ticket/DC399TestCase.php
@@ -22,12 +22,7 @@
 /**
  * Doctrine_Template_TestCase.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @see        www.phpdoctrine.org
- * @since       1.2
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/DC39TestCase.php b/tests/Ticket/DC39TestCase.php
index c8ede80e4..048fe7ff5 100644
--- a/tests/Ticket/DC39TestCase.php
+++ b/tests/Ticket/DC39TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_DC39_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/DC437TestCase.php b/tests/Ticket/DC437TestCase.php
index 1ee950ccd..ebb182c84 100644
--- a/tests/Ticket/DC437TestCase.php
+++ b/tests/Ticket/DC437TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_DC437_TestCase.
  *
  * @author      Eugene Janusov <esycat@gmail.com>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/DC521TestCase.php b/tests/Ticket/DC521TestCase.php
index 6c2219b3f..7a628c0c5 100644
--- a/tests/Ticket/DC521TestCase.php
+++ b/tests/Ticket/DC521TestCase.php
@@ -62,14 +62,10 @@ public function setUp()
  * Doctrine_Ticket_DC521_TestCase.
  *
  * @author      Gergely Kis <gergely.kis@mattakis.com>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.2
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/DC56TestCase.php b/tests/Ticket/DC56TestCase.php
index 1810c6a1b..e64b338d2 100644
--- a/tests/Ticket/DC56TestCase.php
+++ b/tests/Ticket/DC56TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_DC56_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/DC57TestCase.php b/tests/Ticket/DC57TestCase.php
index 2be1a942b..6960223a1 100644
--- a/tests/Ticket/DC57TestCase.php
+++ b/tests/Ticket/DC57TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_DC57_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/DC63TestCase.php b/tests/Ticket/DC63TestCase.php
index ff832eb92..1221fb828 100644
--- a/tests/Ticket/DC63TestCase.php
+++ b/tests/Ticket/DC63TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_DC63_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/DC64TestCase.php b/tests/Ticket/DC64TestCase.php
index 43732e151..7218c6aec 100644
--- a/tests/Ticket/DC64TestCase.php
+++ b/tests/Ticket/DC64TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_DC64_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/DC69TestCase.php b/tests/Ticket/DC69TestCase.php
index 9937cdbd5..03ffa2e03 100644
--- a/tests/Ticket/DC69TestCase.php
+++ b/tests/Ticket/DC69TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_DC69_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/DC709TestCase.php b/tests/Ticket/DC709TestCase.php
index a425e539c..1687c935e 100644
--- a/tests/Ticket/DC709TestCase.php
+++ b/tests/Ticket/DC709TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_DC709_TestCase.
  *
  * @author      John Kary <john@johnkary.net>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/DC74TestCase.php b/tests/Ticket/DC74TestCase.php
index f7d410df3..500b34ff6 100644
--- a/tests/Ticket/DC74TestCase.php
+++ b/tests/Ticket/DC74TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_DC74_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/DC794TestCase.php b/tests/Ticket/DC794TestCase.php
index f31010224..925736c41 100644
--- a/tests/Ticket/DC794TestCase.php
+++ b/tests/Ticket/DC794TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_DC794_TestCase.
  *
  * @author      Enrico Stahn <mail@enricostahn.com>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/DC7TestCase.php b/tests/Ticket/DC7TestCase.php
index 00c456ca6..ffb5b30a6 100644
--- a/tests/Ticket/DC7TestCase.php
+++ b/tests/Ticket/DC7TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_DC7_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/DC825TestCase.php b/tests/Ticket/DC825TestCase.php
index 010d1f3c0..b3a8e5d3f 100644
--- a/tests/Ticket/DC825TestCase.php
+++ b/tests/Ticket/DC825TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_DC825_TestCase.
  *
  * @author      Enrico Stahn <mail@enricostahn.com>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/DC828TestCase.php b/tests/Ticket/DC828TestCase.php
index 75d04eb43..2a264572d 100644
--- a/tests/Ticket/DC828TestCase.php
+++ b/tests/Ticket/DC828TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_DC828_TestCase.
  *
  * @author      Enrico Stahn <mail@enricostahn.com>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/DC82TestCase.php b/tests/Ticket/DC82TestCase.php
index e532d3c69..443a29c5f 100644
--- a/tests/Ticket/DC82TestCase.php
+++ b/tests/Ticket/DC82TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_DC82_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/DC840TestCase.php b/tests/Ticket/DC840TestCase.php
index c82ffce07..cc311b958 100644
--- a/tests/Ticket/DC840TestCase.php
+++ b/tests/Ticket/DC840TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_DC840_TestCase.
  *
  * @author      Enrico Stahn <mail@enricostahn.com>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/DC841TestCase.php b/tests/Ticket/DC841TestCase.php
index 7c90efa65..c6a25303d 100644
--- a/tests/Ticket/DC841TestCase.php
+++ b/tests/Ticket/DC841TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_DC841_TestCase.
  *
  * @author      Enrico Stahn <mail@enricostahn.com>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/DC843TestCase.php b/tests/Ticket/DC843TestCase.php
index ff69abe8b..efbe05a9f 100644
--- a/tests/Ticket/DC843TestCase.php
+++ b/tests/Ticket/DC843TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_DC843_TestCase.
  *
  * @author      Enrico Stahn <mail@enricostahn.com>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/DC848TestCase.php b/tests/Ticket/DC848TestCase.php
index 36048c3c5..0dca20bc8 100644
--- a/tests/Ticket/DC848TestCase.php
+++ b/tests/Ticket/DC848TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_DC848_TestCase.
  *
  * @author      Steffen Zeidler
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.2.4
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/DC86TestCase.php b/tests/Ticket/DC86TestCase.php
index 29b700d2e..9a0bfe0f4 100644
--- a/tests/Ticket/DC86TestCase.php
+++ b/tests/Ticket/DC86TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_DC86_TestCase.
  *
  * @author      Jacek Dębowczyk <j.debowczyk@gmail.com>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/DC879TestCase.php b/tests/Ticket/DC879TestCase.php
index 39fbd9699..c9b4354b2 100644
--- a/tests/Ticket/DC879TestCase.php
+++ b/tests/Ticket/DC879TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_DC879_TestCase.
  *
  * @author Enrico Stahn <mail@enricostahn.com>
- * @license http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category Object Relational Mapping
  *
  * @see www.doctrine-project.org
- * @since 1.0
- *
- * @version $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/DC95TestCase.php b/tests/Ticket/DC95TestCase.php
index d84fdb29b..9d5edf165 100644
--- a/tests/Ticket/DC95TestCase.php
+++ b/tests/Ticket/DC95TestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Ticket_DC95_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/NewTicketTestCase.php b/tests/Ticket/NewTicketTestCase.php
index ca5baa295..09edf5a4a 100644
--- a/tests/Ticket/NewTicketTestCase.php
+++ b/tests/Ticket/NewTicketTestCase.php
@@ -22,14 +22,9 @@
 /**
  * Doctrine_I18nRelation_TestCase.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Ticket/NjeroTestCase.php b/tests/Ticket/NjeroTestCase.php
index e49bce976..359e9280e 100644
--- a/tests/Ticket/NjeroTestCase.php
+++ b/tests/Ticket/NjeroTestCase.php
@@ -3,14 +3,10 @@
  * Doctrine_Ticket_Njero_TestCase.
  *
  * @author      Jeff Rafter <lists@jeffrafter.com>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/TokenizerTestCase.php b/tests/TokenizerTestCase.php
index b20f3c586..022033d58 100644
--- a/tests/TokenizerTestCase.php
+++ b/tests/TokenizerTestCase.php
@@ -23,14 +23,9 @@
  * Doctrine_Tokenizer_TestCase
  * This class tests the functinality of Doctrine_Tokenizer component.
  *
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision: 1181 $
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  *
diff --git a/tests/Transaction/MssqlTestCase.php b/tests/Transaction/MssqlTestCase.php
index 48ce430e5..bcdac7fb9 100644
--- a/tests/Transaction/MssqlTestCase.php
+++ b/tests/Transaction/MssqlTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Transaction_Mssql_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Transaction/MysqlTestCase.php b/tests/Transaction/MysqlTestCase.php
index cad2f467e..500f0524e 100644
--- a/tests/Transaction/MysqlTestCase.php
+++ b/tests/Transaction/MysqlTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Transaction_Mysql_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Transaction/OracleTestCase.php b/tests/Transaction/OracleTestCase.php
index 0a5580683..efe2e0397 100644
--- a/tests/Transaction/OracleTestCase.php
+++ b/tests/Transaction/OracleTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Transaction_Mysql_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Transaction/PgsqlTestCase.php b/tests/Transaction/PgsqlTestCase.php
index 4a77b5dfd..adb5279de 100644
--- a/tests/Transaction/PgsqlTestCase.php
+++ b/tests/Transaction/PgsqlTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Transaction_Pgsql_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Transaction/SqliteTestCase.php b/tests/Transaction/SqliteTestCase.php
index 60c0dc2b8..53bfd1af6 100644
--- a/tests/Transaction/SqliteTestCase.php
+++ b/tests/Transaction/SqliteTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Transaction_Sqlite_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/TransactionTestCase.php b/tests/TransactionTestCase.php
index 0ec5cd65a..31d52a72e 100644
--- a/tests/TransactionTestCase.php
+++ b/tests/TransactionTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Transaction_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/TreeStructureTestCase.php b/tests/TreeStructureTestCase.php
index 9be0c2c55..de4f78226 100644
--- a/tests/TreeStructureTestCase.php
+++ b/tests/TreeStructureTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_TreeStructure_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/UnitOfWorkTestCase.php b/tests/UnitOfWorkTestCase.php
index 9ebd55777..4674855ed 100644
--- a/tests/UnitOfWorkTestCase.php
+++ b/tests/UnitOfWorkTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_UnitOfWork_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Validator/FutureTestCase.php b/tests/Validator/FutureTestCase.php
index 9d8b89163..d3b62dc42 100644
--- a/tests/Validator/FutureTestCase.php
+++ b/tests/Validator/FutureTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Validator_FutureTestCase.
  *
  * @author      Roman Borschel <roman@code-factory.org>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/Validator/PastTestCase.php b/tests/Validator/PastTestCase.php
index 5104f2093..ddba6e18e 100644
--- a/tests/Validator/PastTestCase.php
+++ b/tests/Validator/PastTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_Validator_FutureTestCase.
  *
  * @author      Roman Borschel <roman@code-factory.org>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/ValidatorTestCase.php b/tests/ValidatorTestCase.php
index dde63003b..3639b8abf 100644
--- a/tests/ValidatorTestCase.php
+++ b/tests/ValidatorTestCase.php
@@ -26,14 +26,10 @@
  * @todo More tests to cover the full interface of Doctrine_Validator_ErrorStack.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *
diff --git a/tests/ViewTestCase.php b/tests/ViewTestCase.php
index 47b57cb73..5c3d9c500 100644
--- a/tests/ViewTestCase.php
+++ b/tests/ViewTestCase.php
@@ -23,14 +23,10 @@
  * Doctrine_View_TestCase.
  *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  *
  * @category    Object Relational Mapping
  *
  * @see        www.doctrine-project.org
- * @since       1.0
- *
- * @version     $Revision$
  *
  * @internal
  *