diff --git a/cake/console/libs/acl.php b/cake/console/libs/acl.php
index 13796f8cc..6bd6bc0bf 100644
--- a/cake/console/libs/acl.php
+++ b/cake/console/libs/acl.php
@@ -236,7 +236,7 @@ class AclShell extends Shell {
  * @param integer $indent indent level.
  * @return void
  * @access protected
- **/
+ */
 	function _outputNode($class, $node, $indent) {
 		$indent = str_repeat('  ', $indent);
 		$data = $node[$class];
@@ -521,7 +521,7 @@ class AclShell extends Shell {
  *
  * @param string $identifier Identifier to parse
  * @return mixed a string for aliases, and an array for model.foreignKey
- **/
+ */
 	function parseIdentifier($identifier) {
 		if (preg_match('/^([\w]+)\.(.*)$/', $identifier, $matches)) {
 			return array(
@@ -539,7 +539,7 @@ class AclShell extends Shell {
  * @param string $class Class type you want (Aro/Aco)
  * @param mixed $identifier A mixed identifier for finding the node.
  * @return int Integer of NodeId. Will trigger an error if nothing is found.
- **/
+ */
 	function _getNodeId($class, $identifier) {
 		$node = $this->Acl->{$class}->node($identifier);
 		if (empty($node)) {
diff --git a/cake/console/libs/schema.php b/cake/console/libs/schema.php
index 78fdf0ecb..b6c69708a 100644
--- a/cake/console/libs/schema.php
+++ b/cake/console/libs/schema.php
@@ -242,7 +242,7 @@ class SchemaShell extends Shell {
  * Run database create commands.  Alias for run create.
  *
  * @return void
- **/
+ */
 	function create() {
 		list($Schema, $table) = $this->_loadSchema();
 		$this->__create($Schema, $table);
@@ -252,7 +252,7 @@ class SchemaShell extends Shell {
  * Run database create commands.  Alias for run create.
  *
  * @return void
- **/
+ */
 	function update() {
 		list($Schema, $table) = $this->_loadSchema();
 		$this->__update($Schema, $table);
@@ -262,7 +262,7 @@ class SchemaShell extends Shell {
  * Prepares the Schema objects for database operations.
  *
  * @return void
- **/
+ */
 	function _loadSchema() {
 		$name = $plugin = null;
 		if (isset($this->params['name'])) {
diff --git a/cake/console/libs/shell.php b/cake/console/libs/shell.php
index 6452a8a9b..0a481db60 100644
--- a/cake/console/libs/shell.php
+++ b/cake/console/libs/shell.php
@@ -642,7 +642,7 @@ class Shell extends Object {
  *
  * @param string $pluginName Name of the plugin you want ie. DebugKit
  * @return string $path path to the correct plugin.
- **/
+ */
 	function _pluginPath($pluginName) {
 		return App::pluginPath($pluginName);
 	}
diff --git a/cake/console/libs/tasks/controller.php b/cake/console/libs/tasks/controller.php
index cc88dcd42..9c6fd14e5 100644
--- a/cake/console/libs/tasks/controller.php
+++ b/cake/console/libs/tasks/controller.php
@@ -113,7 +113,7 @@ class ControllerTask extends Shell {
  *
  * @access public
  * @return void
- **/
+ */
 	function all() {
 		$this->interactive = false;
 		$this->listAll($this->connection, false);
@@ -219,7 +219,7 @@ class ControllerTask extends Shell {
  * Confirm a to be baked controller with the user
  *
  * @return void
- **/
+ */
 	function confirmController($controllerName, $useDynamicScaffold, $helpers, $components) {
 		$this->out();
 		$this->hr();
@@ -257,7 +257,7 @@ class ControllerTask extends Shell {
  * Interact with the user and ask about which methods (admin or regular they want to bake)
  *
  * @return array Array containing (bakeRegular, bakeAdmin) answers
- **/
+ */
 	function _askAboutMethods() {
 		$wannaBakeCrud = $this->in(
 			__("Would you like to create some basic class methods \n(index(), add(), view(), edit())?", true),
@@ -348,7 +348,7 @@ class ControllerTask extends Shell {
  * Interact with the user and get a list of additional helpers
  *
  * @return array Helpers that the user wants to use.
- **/
+ */
 	function doHelpers() {
 		return $this->_doPropertyChoices(
 			__("Would you like this controller to use other helpers\nbesides HtmlHelper and FormHelper?", true),
@@ -360,7 +360,7 @@ class ControllerTask extends Shell {
  * Interact with the user and get a list of additional components
  *
  * @return array Components the user wants to use.
- **/
+ */
 	function doComponents() {
 		return $this->_doPropertyChoices(
 			__("Would you like this controller to use any components?", true),
@@ -374,7 +374,7 @@ class ControllerTask extends Shell {
  * @param string $prompt A yes/no question to precede the list
  * @param sting $example A question for a comma separated list, with examples.
  * @return array Array of values for property.
- **/
+ */
 	function _doPropertyChoices($prompt, $example) {
 		$proceed = $this->in($prompt, array('y','n'), 'n');
 		$property = array();
diff --git a/cake/console/libs/tasks/db_config.php b/cake/console/libs/tasks/db_config.php
index 6635fe8c0..b9253558a 100644
--- a/cake/console/libs/tasks/db_config.php
+++ b/cake/console/libs/tasks/db_config.php
@@ -53,7 +53,7 @@ class DbConfigTask extends Shell {
  * Used for testing.
  *
  * @var string
- **/
+ */
 	var $databaseClassName = 'DATABASE_CONFIG';
 
 /**
@@ -351,7 +351,7 @@ class DbConfigTask extends Shell {
  * Get a user specified Connection name
  *
  * @return void
- **/
+ */
 	function getConfig() {
 		App::import('Model', 'ConnectionManager', false);
 
diff --git a/cake/console/libs/tasks/fixture.php b/cake/console/libs/tasks/fixture.php
index 98c1ecea8..82dec5869 100644
--- a/cake/console/libs/tasks/fixture.php
+++ b/cake/console/libs/tasks/fixture.php
@@ -54,14 +54,14 @@ class FixtureTask extends Shell {
  * The db connection being used for baking
  *
  * @var string
- **/
+ */
 	var $connection = null;
 
 /**
  * Schema instance
  *
  * @var object
- **/
+ */
 	var $_Schema = null;
 
 /**
@@ -103,7 +103,7 @@ class FixtureTask extends Shell {
  *
  * @access public
  * @return void
- **/
+ */
 	function all() {
 		$this->interactive = false;
 		$this->Model->interactive = false;
@@ -140,7 +140,7 @@ class FixtureTask extends Shell {
  *
  * @param string $modelName Name of model you are dealing with.
  * @return array Array of import options.
- **/
+ */
 	function importOptions($modelName) {
 		$options = array();
 		$doSchema = $this->in(__('Would you like to import schema for this fixture?', true), array('y', 'n'), 'n');
@@ -230,7 +230,7 @@ class FixtureTask extends Shell {
  * @param string $fixture Contents of the fixture file.
  * @access public
  * @return void
- **/
+ */
 	function generateFixtureFile($model, $otherVars) {
 		$defaults = array('table' => null, 'schema' => null, 'records' => null, 'import' => null, 'fields' => null);
 		$vars = array_merge($defaults, $otherVars);
@@ -255,7 +255,7 @@ class FixtureTask extends Shell {
  *
  * @param array $table Table schema array
  * @return string fields definitions
- **/
+ */
 	function _generateSchema($tableInfo) {
 		$schema = $this->_Schema->generateTable('f', $tableInfo);
 		return substr($schema, 10, -2);
@@ -266,7 +266,7 @@ class FixtureTask extends Shell {
  *
  * @param array $table Table schema array
  * @return array Array of records to use in the fixture.
- **/
+ */
 	function _generateRecords($tableInfo, $recordCount = 1) {
 		$records = array();
 		for ($i = 0; $i < $recordCount; $i++) {
@@ -337,7 +337,7 @@ class FixtureTask extends Shell {
  *
  * @param array $records Array of records to be converted to string
  * @return string A string value of the $records array.
- **/
+ */
 	function _makeRecordString($records) {
 		$out = "array(\n";
 		foreach ($records as $record) {
@@ -360,7 +360,7 @@ class FixtureTask extends Shell {
  * @param string $modelName name of the model to take records from.
  * @param string $useTable Name of table to use.
  * @return array Array of records.
- **/
+ */
 	function _getRecordsFromTable($modelName, $useTable = null) {
 		if ($this->interactive) {
 			$condition = null;
diff --git a/cake/console/libs/tasks/model.php b/cake/console/libs/tasks/model.php
index 8d616a71a..30cce0e0d 100644
--- a/cake/console/libs/tasks/model.php
+++ b/cake/console/libs/tasks/model.php
@@ -64,14 +64,14 @@ class ModelTask extends Shell {
  * Holds tables found on connection.
  *
  * @var array
- **/
+ */
 	var $__tables = array();
 
 /**
  * Holds validation method map.
  *
  * @var array
- **/
+ */
 	var $__validations = array();
 
 /**
@@ -109,7 +109,7 @@ class ModelTask extends Shell {
  * Bake all models at once.
  *
  * @return void
- **/
+ */
 	function all() {
 		$this->listAll($this->connection, false);
 		$unitTestExists = $this->_checkUnitTest();
@@ -129,7 +129,7 @@ class ModelTask extends Shell {
  *
  * @param string $className Name of class you want model to be.
  * @return object Model instance
- **/
+ */
 	function &_getModelObject($className) {
 		$object = new Model(array('name' => $className, 'ds' => $this->connection));
 		return $object;
@@ -142,7 +142,7 @@ class ModelTask extends Shell {
  * @param string $prompt Prompt to use for options list.
  * @param integer $default The default option for the given prompt.
  * @return result of user choice.
- **/
+ */
 	function inOptions($options, $prompt = null, $default = null) {
 		$valid = false;
 		$max = count($options);
@@ -262,7 +262,7 @@ class ModelTask extends Shell {
  * @param string $associations Collection of associations.
  * @access protected
  * @return void
- **/
+ */
 	function _printAssociation($modelName, $type, $associations) {
 		if (!empty($associations[$type])) {
 			for ($i = 0; $i < count($associations[$type]); $i++) {
@@ -278,7 +278,7 @@ class ModelTask extends Shell {
  * @param array $fields Array of fields that might have a primary key.
  * @return string Name of field that is a primary key.
  * @access public
- **/
+ */
 	function findPrimaryKey($fields) {
 		foreach ($fields as $name => $field) {
 			if (isset($field['key']) && $field['key'] == 'primary') {
@@ -293,7 +293,7 @@ class ModelTask extends Shell {
  *
  * @param array $fields Array of fields to look for and choose as a displayField
  * @return mixed Name of field to use for displayField or false if the user declines to choose
- **/
+ */
 	function findDisplayField($fields) {
 		$fieldNames = array_keys($fields);
 		$prompt = __("A displayField could not be automatically detected\nwould you like to choose one?", true);
@@ -337,7 +337,7 @@ class ModelTask extends Shell {
  * Populate the __validations array
  *
  * @return void
- **/
+ */
 	function initValidations() {
 		$options = $choices = array();
 		if (class_exists('Validation')) {
@@ -363,7 +363,7 @@ class ModelTask extends Shell {
  * @param string $fieldName Name of field to be validated.
  * @param array $metaData metadata for field
  * @return array Array of validation for the field.
- **/
+ */
 	function fieldValidation($fieldName, $metaData, $primaryKey = 'id') {
 		$defaultChoice = count($this->__validations);
 		$validate = $alreadyChosen = array();
@@ -484,7 +484,7 @@ class ModelTask extends Shell {
  * @param object $model Model instance of model being generated.
  * @param array $associations Array of inprogress associations
  * @return array $associations with belongsTo added in.
- **/
+ */
 	function findBelongsTo(&$model, $associations) {
 		$fields = $model->schema();
 		foreach ($fields as $fieldName => $field) {
@@ -513,7 +513,7 @@ class ModelTask extends Shell {
  * @param object $model Model instance being generated
  * @param array $associations Array of inprogress associations
  * @return array $associations with hasOne and hasMany added in.
- **/
+ */
 	function findHasOneAndMany(&$model, $associations) {
 		$foreignKey = $this->_modelKey($model->name);
 		foreach ($this->__tables as $otherTable) {
@@ -556,7 +556,7 @@ class ModelTask extends Shell {
  * @param object $model Model instance being generated
  * @param array $associations Array of inprogress associations
  * @return array $associations with hasAndBelongsToMany added in.
- **/
+ */
 	function findHasAndBelongsToMany(&$model, $associations) {
 		$foreignKey = $this->_modelKey($model->name);
 		foreach ($this->__tables as $otherTable) {
@@ -596,7 +596,7 @@ class ModelTask extends Shell {
  * @param array $model Temporary Model instance.
  * @param array $associations Array of associations to be confirmed.
  * @return array Array of confirmed associations
- **/
+ */
 	function confirmAssociations(&$model, $associations) {
 		foreach ($associations as $type => $settings) {
 			if (!empty($associations[$type])) {
@@ -624,7 +624,7 @@ class ModelTask extends Shell {
  * @param object $model Temporary model instance
  * @param array $associations Array of associations.
  * @return array Array of associations.
- **/
+ */
 	function doMoreAssociations($model, $associations) {
 		$prompt = __('Would you like to define some additional model associations?', true);
 		$wannaDoMoreAssoc = $this->in($prompt, array('y','n'), 'n');
@@ -689,7 +689,7 @@ class ModelTask extends Shell {
  * Finds all possible keys to use on custom associations.
  *
  * @return array array of tables and possible keys
- **/
+ */
 	function _generatePossibleKeys() {
 		$possible = array();
 		foreach ($this->__tables as $otherTable) {
@@ -782,7 +782,7 @@ class ModelTask extends Shell {
  * @param string $modelName Name of the model you want a table for.
  * @param string $useDbConfig Name of the database config you want to get tables from.
  * @return void
- **/
+ */
 	function getTable($modelName, $useDbConfig = null) {
 		if (!isset($useDbConfig)) {
 			$useDbConfig = $this->connection;
@@ -811,7 +811,7 @@ class ModelTask extends Shell {
  *
  * @param string $useDbConfig Connection name to scan.
  * @return array Array of tables in the database.
- **/
+ */
 	function getAllTables($useDbConfig = null) {
 		if (!isset($useDbConfig)) {
 			$useDbConfig = $this->connection;
@@ -906,7 +906,7 @@ class ModelTask extends Shell {
  * @access public
  * @return void
  * @see FixtureTask::bake
- **/
+ */
 	function bakeFixture($className, $useTable = null) {
 		$this->Fixture->connection = $this->connection;
 		$this->Fixture->plugin = $this->plugin;
diff --git a/cake/console/libs/tasks/plugin.php b/cake/console/libs/tasks/plugin.php
index 05309bdcc..03b563dc1 100644
--- a/cake/console/libs/tasks/plugin.php
+++ b/cake/console/libs/tasks/plugin.php
@@ -204,7 +204,7 @@ class PluginTask extends Shell {
  * find and change $this->path to the user selection
  *
  * @return void
- **/
+ */
 	function findPath($pathOptions) {
 		$valid = false;
 		$max = count($pathOptions);
diff --git a/cake/console/libs/tasks/project.php b/cake/console/libs/tasks/project.php
index 6194fab31..196273fb3 100644
--- a/cake/console/libs/tasks/project.php
+++ b/cake/console/libs/tasks/project.php
@@ -30,7 +30,7 @@ class ProjectTask extends Shell {
  * configs path (used in testing).
  *
  * @var string
- **/
+ */
 	var $configPath = null;
 
 /**
diff --git a/cake/console/libs/tasks/template.php b/cake/console/libs/tasks/template.php
index fcf835492..422b775c1 100644
--- a/cake/console/libs/tasks/template.php
+++ b/cake/console/libs/tasks/template.php
@@ -23,7 +23,7 @@ class TemplateTask extends Shell {
  * variables to add to template scope
  *
  * @var array
- **/
+ */
 	var $templateVars = array();
 
 /**
@@ -31,7 +31,7 @@ class TemplateTask extends Shell {
  * Contains a list of $theme => $path
  *
  * @var array
- **/
+ */
 	var $templatePaths = array();
 
 /**
@@ -39,7 +39,7 @@ class TemplateTask extends Shell {
  *
  * @access public
  * @return void
- **/
+ */
 	function initialize() {
 		$this->templatePaths = $this->_findThemes();
 	}
@@ -50,7 +50,7 @@ class TemplateTask extends Shell {
  * Bake themes are directories not named `skel` inside a `vendors/shells/templates` path.
  *
  * @return array Array of bake themes that are installed.
- **/
+ */
 	function _findThemes() {
 		$paths = App::path('shells');
 		$core = array_pop($paths);
@@ -128,7 +128,7 @@ class TemplateTask extends Shell {
  * @param string $vars Additional vars to set to template scope.
  * @access public
  * @return contents of generated code template
- **/
+ */
 	function generate($directory, $filename, $vars = null) {
 		if ($vars !== null) {
 			$this->set($vars);
@@ -156,7 +156,7 @@ class TemplateTask extends Shell {
  * If there is more than one installed theme user interaction will happen
  *
  * @return string returns the path to the selected theme.
- **/
+ */
 	function getThemePath() {
 		if (count($this->templatePaths) == 1) {
 			$paths = array_values($this->templatePaths);
@@ -193,7 +193,7 @@ class TemplateTask extends Shell {
  * @param string $filename lower_case_underscored filename you want.
  * @access public
  * @return string filename will exit program if template is not found.
- **/
+ */
 	function _findTemplate($path, $directory, $filename) {
 		$themeFile = $path . $directory . DS . $filename . '.ctp';
 		if (file_exists($themeFile)) {
diff --git a/cake/console/libs/tasks/test.php b/cake/console/libs/tasks/test.php
index b4a1929da..06cf9c5bb 100644
--- a/cake/console/libs/tasks/test.php
+++ b/cake/console/libs/tasks/test.php
@@ -46,28 +46,28 @@ class TestTask extends Shell {
  * Tasks used.
  *
  * @var array
- **/
+ */
 	var $tasks = array('Template');
 
 /**
  * class types that methods can be generated for
  *
  * @var array
- **/
+ */
 	var $classTypes =  array('Model', 'Controller', 'Component', 'Behavior', 'Helper');
 
 /**
  * Internal list of fixtures that have been added so far.
  *
  * @var string
- **/
+ */
 	var $_fixtures = array();
 
 /**
  * Flag for interactive mode
  *
  * @var boolean
- **/
+ */
 	var $interactive = false;
 
 /**
@@ -164,7 +164,7 @@ class TestTask extends Shell {
  * Interact with the user and get their chosen type. Can exit the script.
  *
  * @return string Users chosen type.
- **/
+ */
 	function getObjectType() {
 		$this->hr();
 		$this->out(__("Select an object type:", true));
@@ -188,7 +188,7 @@ class TestTask extends Shell {
  *
  * @param string $objectType Type of object to list classes for i.e. Model, Controller.
  * @return string Class name the user chose.
- **/
+ */
 	function getClassName($objectType) {
 		$options = App::objects(strtolower($objectType));
 		$this->out(sprintf(__('Choose a %s class', true), $objectType));
@@ -209,7 +209,7 @@ class TestTask extends Shell {
  * Currently only model, and controller are supported
  *
  * @return boolean
- **/
+ */
 	function typeCanDetectFixtures($type) {
 		$type = strtolower($type);
 		return ($type == 'controller' || $type == 'model');
@@ -219,7 +219,7 @@ class TestTask extends Shell {
  * Check if a class with the given type is loaded or can be loaded.
  *
  * @return boolean
- **/
+ */
 	function isLoadableClass($type, $class) {
 		return App::import($type, $class);
 	}
@@ -229,7 +229,7 @@ class TestTask extends Shell {
  * So that fixtures can be detected
  *
  * @return object
- **/
+ */
 	function &buildTestSubject($type, $class) {
 		ClassRegistry::flush();
 		App::import($type, $class);
@@ -246,7 +246,7 @@ class TestTask extends Shell {
  * Gets the real class name from the cake short form.
  *
  * @return string Real classname
- **/
+ */
 	function getRealClassName($type, $class) {
 		if (strtolower($type) == 'model') {
 			return $class;
@@ -260,7 +260,7 @@ class TestTask extends Shell {
  *
  * @param string $className Name of class to look at.
  * @return array Array of method names.
- **/
+ */
 	function getTestableMethods($className) {
 		$classMethods = get_class_methods($className);
 		$parentMethods = get_class_methods(get_parent_class($className));
@@ -280,7 +280,7 @@ class TestTask extends Shell {
  *
  * @param object The object you want to generate fixtures for.
  * @return array Array of fixtures to be included in the test.
- **/
+ */
 	function generateFixtureList(&$subject) {
 		$this->_fixtures = array();
 		if (is_a($subject, 'Model')) {
@@ -297,7 +297,7 @@ class TestTask extends Shell {
  *
  * @return void
  * @access protected
- **/
+ */
 	function _processModel(&$subject) {
 		$this->_addFixture($subject->name);
 		$associated = $subject->getAssociated();
@@ -321,7 +321,7 @@ class TestTask extends Shell {
  *
  * @return void
  * @access protected
- **/
+ */
 	function _processController(&$subject) {
 		$subject->constructClasses();
 		$models = array(Inflector::classify($subject->name));
@@ -339,7 +339,7 @@ class TestTask extends Shell {
  *
  * @return void
  * @access protected
- **/
+ */
 	function _addFixture($name) {
 		$parent = get_parent_class($name);
 		$prefix = 'app.';
@@ -355,7 +355,7 @@ class TestTask extends Shell {
  * Interact with the user to get additional fixtures they want to use.
  *
  * @return void
- **/
+ */
 	function getUserFixtures() {
 		$proceed = $this->in(__('Bake could not detect fixtures, would you like to add some?', true), array('y','n'), 'n');
 		$fixtures = array();
@@ -373,7 +373,7 @@ class TestTask extends Shell {
  * Controllers require a mock class.
  *
  * @return boolean
- **/
+ */
 	function hasMockClass($type) {
 		$type = strtolower($type);
 		return $type == 'controller';
@@ -383,7 +383,7 @@ class TestTask extends Shell {
  * Generate a constructor code snippet for the type and classname
  *
  * @return string Constructor snippet for the thing you are building.
- **/
+ */
 	function generateConstructor($type, $fullClassName) {
 		$type = strtolower($type);
 		if ($type == 'model') {
@@ -401,7 +401,7 @@ class TestTask extends Shell {
  * and get the plugin path if needed.
  *
  * @return string filename the test should be created on
- **/
+ */
 	function testCaseFileName($type, $className) {
 		$path = $this->path;
 		if (isset($this->plugin)) {
@@ -418,7 +418,7 @@ class TestTask extends Shell {
  * Show help file.
  *
  * @return void
- **/
+ */
 	function help() {
 		$this->hr();
 		$this->out("Usage: cake bake test <type> <class>");
diff --git a/cake/console/libs/tasks/view.php b/cake/console/libs/tasks/view.php
index 1bad40f5a..5a1b0a0b3 100644
--- a/cake/console/libs/tasks/view.php
+++ b/cake/console/libs/tasks/view.php
@@ -144,7 +144,7 @@ class ViewTask extends Shell {
  * Get a list of actions that can / should have views baked for them.
  *
  * @return array Array of action names that should be baked
- **/
+ */
 	function _methodsToBake() {
 		$methods =  array_diff(
 			array_map('strtolower', get_class_methods($this->controllerName . 'Controller')),
@@ -176,7 +176,7 @@ class ViewTask extends Shell {
  * Bake All views for All controllers.
  *
  * @return void
- **/
+ */
 	function all() {
 		$this->Controller->interactive = false;
 		$tables = $this->Controller->listAll($this->connection, false);
@@ -308,7 +308,7 @@ class ViewTask extends Shell {
  *
  * @param array $actions Array of actions to make files for.
  * @return void
- **/
+ */
 	function bakeActions($actions, $vars) {
 		foreach ($actions as $action) {
 			$content = $this->getContent($action, $vars);
@@ -320,7 +320,7 @@ class ViewTask extends Shell {
  * handle creation of baking a custom action view file
  *
  * @return void
- **/
+ */
 	function customAction() {
 		$action = '';
 		while ($action == '') {
diff --git a/cake/libs/cake_log.php b/cake/libs/cake_log.php
index 571cb1c4b..a2300abb2 100644
--- a/cake/libs/cake_log.php
+++ b/cake/libs/cake_log.php
@@ -60,7 +60,7 @@ class CakeLog {
  *
  * @var array
  * @access protected
- **/
+ */
 	var $_streams = array();
 
 /**
@@ -68,7 +68,7 @@ class CakeLog {
  *
  * @return void
  * @static
- **/
+ */
 	function &getInstance() {
 		static $instance = array();
 		if (!isset($instance[0])) {
@@ -85,7 +85,7 @@ class CakeLog {
  * @param array $config Array of configuration information for the logger
  * @return boolean success of configuration.
  * @static
- **/
+ */
 	function config($key, $config) {
 		if (empty($config['engine'])) {
 			trigger_error(__('Missing logger classname', true), E_USER_WARNING);
@@ -107,7 +107,7 @@ class CakeLog {
  *
  * @return mixed boolean false on any failures, string of classname to use if search was successful.\
  * @access protected
- **/
+ */
 	function _getLogger($loggerName) {
 		$plugin = null;
 		if (strpos($loggerName, '.') !== false) {
@@ -139,7 +139,7 @@ class CakeLog {
  *
  * @return array
  * @static
- **/
+ */
 	function streams() {
 		$self = CakeLog::getInstance();
 		return array_keys($self->_streams);
@@ -152,7 +152,7 @@ class CakeLog {
  * @param string $keyname Key name of callable to remove.
  * @return void
  * @static
- **/
+ */
 	function remove($streamName) {
 		$self = CakeLog::getInstance();
 		unset($self->_streams[$streamName]);
@@ -167,7 +167,7 @@ class CakeLog {
  * @param array $config Array of config information for the LogStream
  * @return boolean success
  * @static
- **/
+ */
 	function addStream($key, $config) {
 		$self = CakeLog::getInstance();
 		$self->_streams[$key] = $config;
@@ -178,7 +178,7 @@ class CakeLog {
  *
  * @return void
  * @access protected
- **/
+ */
 	function _autoConfig() {
 		if (!class_exists('FileLog')) {
 			App::import('Core', 'log/FileLog');
@@ -235,7 +235,7 @@ class CakeLog {
  * @param integer $line Line that triggered the error
  * @param array $context Context
  * @return void
- **/
+ */
 	function handleError($code, $description, $file = null, $line = null, $context = null) {
 		if ($code === 2048 || $code === 8192) {
 			return;
diff --git a/cake/libs/cake_session.php b/cake/libs/cake_session.php
index 357c2ec67..957af54ff 100644
--- a/cake/libs/cake_session.php
+++ b/cake/libs/cake_session.php
@@ -244,7 +244,7 @@ class CakeSession extends Object {
  *
  * @return boolean
  * @deprecated Use CakeSession::delete instead
- **/
+ */
 	function del($name) {
 		trigger_error('CakeSession::del() is deprecated, use CakeSession::delete() instead.', E_USER_WARNING);
 		return $this->delete($name);
diff --git a/cake/libs/configure.php b/cake/libs/configure.php
index 3bdc14e8f..fb86ed3b3 100644
--- a/cake/libs/configure.php
+++ b/cake/libs/configure.php
@@ -685,7 +685,7 @@ class App extends Object {
  *
  * @param string $plugin CamelCased plugin name to find the path of.
  * @return string full path to the plugin.
- **/
+ */
 	function pluginPath($plugin) {
 		$_this =& App::getInstance();
 		$pluginDir = Inflector::underscore($plugin);
diff --git a/cake/libs/controller/component.php b/cake/libs/controller/component.php
index f4ed6a4cb..081c81a5e 100644
--- a/cake/libs/controller/component.php
+++ b/cake/libs/controller/component.php
@@ -56,7 +56,7 @@ class Component extends Object {
  *
  * @var array
  * @access private
- **/
+ */
 	var $__settings = array();
 
 /**
diff --git a/cake/libs/controller/components/cookie.php b/cake/libs/controller/components/cookie.php
index 9ddfc24ca..62331b1e2 100644
--- a/cake/libs/controller/components/cookie.php
+++ b/cake/libs/controller/components/cookie.php
@@ -263,7 +263,7 @@ class CookieComponent extends Object {
 
 /**
  * @deprecated use delete()
- **/
+ */
 	function del($key) {
 		trigger_error('Deprecated method, use CookieComponent::delete instead', E_USER_WARNING);
 		return $this->delete($key);
diff --git a/cake/libs/inflector.php b/cake/libs/inflector.php
index ba82dd919..2ae7d1393 100644
--- a/cake/libs/inflector.php
+++ b/cake/libs/inflector.php
@@ -37,7 +37,7 @@ class Inflector {
  *
  * @var array
  * @access protected
- **/
+ */
 	var $_plural = array(
 		'rules' => array(
 			'/(s)tatus$/i' => '\1\2tatuses',
@@ -105,7 +105,7 @@ class Inflector {
  *
  * @var array
  * @access protected
- **/
+ */
 	var $_singular = array(
 		'rules' => array(
 			'/(s)tatuses$/i' => '\1\2tatus',
@@ -155,7 +155,7 @@ class Inflector {
  *
  * @var array
  * @access protected
- **/
+ */
 	var $_uninflected = array(
 		'Amoyese', 'bison', 'Borghese', 'bream', 'breeches', 'britches', 'buffalo', 'cantus',
 		'carp', 'chassis', 'clippers', 'cod', 'coitus', 'Congoese', 'contretemps', 'corps',
@@ -176,7 +176,7 @@ class Inflector {
  *
  * @var array
  * @access protected
- **/
+ */
 	var $_pluralized = array();
 
 /**
@@ -184,7 +184,7 @@ class Inflector {
  *
  * @var array
  * @access protected
- **/
+ */
 	var $_singularized = array();
 
 /**
diff --git a/cake/libs/log/file_log.php b/cake/libs/log/file_log.php
index 76c0e50b9..e726bf231 100644
--- a/cake/libs/log/file_log.php
+++ b/cake/libs/log/file_log.php
@@ -31,7 +31,7 @@ class FileLog {
  * Path to save log files on.
  *
  * @var string
- **/
+ */
 	var $_path = null;
 
 /**
@@ -43,7 +43,7 @@ class FileLog {
  *
  * @param array $options Options for the FileLog, see above.
  * @return void
- **/
+ */
 	function FileLog($options = array()) {
 		$options += array('path' => LOGS);
 		$this->_path = $options['path'];
@@ -55,7 +55,7 @@ class FileLog {
  * @param string $type The type of log you are making.
  * @param string $message The message you want to log.
  * @return boolean success of write.
- **/
+ */
 	function write($type, $message) {
 		$debugTypes = array('notice', 'info', 'debug');
 
diff --git a/cake/libs/magic_db.php b/cake/libs/magic_db.php
index fd8965851..feb780b0e 100644
--- a/cake/libs/magic_db.php
+++ b/cake/libs/magic_db.php
@@ -36,7 +36,7 @@ class MagicDb extends Object {
  * Holds the parsed MagicDb for this class instance
  *
  * @var array
- **/
+ */
 	var $db = array();
 
 /**
@@ -45,7 +45,7 @@ class MagicDb extends Object {
  * @var $magicDb mixed Can be an array containing the db, a magic db as a string, or a filename pointing to a magic db in .db or magic.db.php format
  * @return boolean Returns false if reading / validation failed or true on success.
  * @author        Felix
- **/
+ */
 	function read($magicDb = null) {
 		if (!is_string($magicDb) && !is_array($magicDb)) {
 			return false;
diff --git a/cake/libs/model/cake_schema.php b/cake/libs/model/cake_schema.php
index 28008cbd2..82b9bdafa 100644
--- a/cake/libs/model/cake_schema.php
+++ b/cake/libs/model/cake_schema.php
@@ -63,7 +63,7 @@ class CakeSchema extends Object {
  * plugin name.
  *
  * @var string
- **/
+ */
 	var $plugin = null;
 
 /**
@@ -382,7 +382,7 @@ class CakeSchema extends Object {
  * @param string $table Table name you want returned.
  * @param array $fields Array of field information to generate the table with.
  * @return string Variable declaration for a schema class
- **/
+ */
 	function generateTable($table, $fields) {
 		$out = "\tvar \${$table} = array(\n";
 		if (is_array($fields)) {
@@ -573,7 +573,7 @@ class CakeSchema extends Object {
  * @param array $new New indexes
  * @param array $old Old indexes
  * @return mixed False on failure, or an array of parameters to add & drop.
- **/
+ */
 	function _compareTableParameters($new, $old) {
 		if (!is_array($new) || !is_array($old)) {
 			return false;
diff --git a/cake/libs/model/datasources/datasource.php b/cake/libs/model/datasources/datasource.php
index 1e0d904ec..b4742cdfa 100644
--- a/cake/libs/model/datasources/datasource.php
+++ b/cake/libs/model/datasources/datasource.php
@@ -404,7 +404,7 @@ class DataSource extends Object {
  * before establishing a connection.
  *
  * @return boolean Whether or not the Datasources conditions for use are met.
- **/
+ */
 	function enabled() {
 		return true;
 	}
diff --git a/cake/libs/model/datasources/dbo/dbo_adodb.php b/cake/libs/model/datasources/dbo/dbo_adodb.php
index ae9c20b81..ec4f2a763 100644
--- a/cake/libs/model/datasources/dbo/dbo_adodb.php
+++ b/cake/libs/model/datasources/dbo/dbo_adodb.php
@@ -123,7 +123,7 @@ class DboAdodb extends DboSource {
  * Check that AdoDB is available.
  *
  * @return boolean
- **/
+ */
 	function enabled() {
 		return function_exists('NewADOConnection');
 	}
diff --git a/cake/libs/model/datasources/dbo/dbo_db2.php b/cake/libs/model/datasources/dbo/dbo_db2.php
index 1f44cb03a..25e4f0d0d 100644
--- a/cake/libs/model/datasources/dbo/dbo_db2.php
+++ b/cake/libs/model/datasources/dbo/dbo_db2.php
@@ -144,7 +144,7 @@ class DboDb2 extends DboSource {
  * Check that the DB2 extension is installed/loaded
  *
  * @return boolean
- **/
+ */
 	function enabled() {
 		return extension_loaded('ibm_db2');
 	}
diff --git a/cake/libs/model/datasources/dbo/dbo_firebird.php b/cake/libs/model/datasources/dbo/dbo_firebird.php
index cfafb9f0c..d5a00c133 100644
--- a/cake/libs/model/datasources/dbo/dbo_firebird.php
+++ b/cake/libs/model/datasources/dbo/dbo_firebird.php
@@ -117,7 +117,7 @@ class DboFirebird extends DboSource {
  * Firebird Transaction commands.
  *
  * @var array
- **/
+ */
 	var $_commands = array(
 		'begin'	   => 'SET TRANSACTION',
 		'commit'   => 'COMMIT',
@@ -143,7 +143,7 @@ class DboFirebird extends DboSource {
  * Check that the interbase extension is loaded
  *
  * @return boolean
- **/
+ */
 	function enabled() {
 		return extension_loaded('interbase');
 	}
diff --git a/cake/libs/model/datasources/dbo/dbo_mssql.php b/cake/libs/model/datasources/dbo/dbo_mssql.php
index b698f1c97..1424332f4 100644
--- a/cake/libs/model/datasources/dbo/dbo_mssql.php
+++ b/cake/libs/model/datasources/dbo/dbo_mssql.php
@@ -162,7 +162,7 @@ class DboMssql extends DboSource {
  * Check that MsSQL is installed/loaded
  *
  * @return boolean
- **/
+ */
 	function enabled() {
 		return extension_loaded('mssql');
 	}
diff --git a/cake/libs/model/datasources/dbo/dbo_mysql.php b/cake/libs/model/datasources/dbo/dbo_mysql.php
index 01ca7cf4d..f4b77f0a3 100644
--- a/cake/libs/model/datasources/dbo/dbo_mysql.php
+++ b/cake/libs/model/datasources/dbo/dbo_mysql.php
@@ -352,7 +352,7 @@ class DboMysqlBase extends DboSource {
  * @param array $parameters Parameters to add & drop.
  * @return array Array of table property alteration statementes.
  * @todo Implement this method.
- **/
+ */
 	function _alterTableParameters($table, $parameters) {
 		if (isset($parameters['change'])) {
 			return $this->buildTableParameters($parameters['change']);
@@ -530,7 +530,7 @@ class DboMysql extends DboMysqlBase {
  * Check whether the MySQL extension is installed/loaded
  *
  * @return boolean
- **/
+ */
 	function enabled() {
 		return extension_loaded('mysql');
 	}
diff --git a/cake/libs/model/datasources/dbo/dbo_mysqli.php b/cake/libs/model/datasources/dbo/dbo_mysqli.php
index f1b45020b..6826024b2 100644
--- a/cake/libs/model/datasources/dbo/dbo_mysqli.php
+++ b/cake/libs/model/datasources/dbo/dbo_mysqli.php
@@ -87,7 +87,7 @@ class DboMysqli extends DboMysqlBase {
  * Check that MySQLi is installed/enabled
  *
  * @return boolean
- **/
+ */
 	function enabled() {
 		return extension_loaded('mysqli');
 	}
diff --git a/cake/libs/model/datasources/dbo/dbo_odbc.php b/cake/libs/model/datasources/dbo/dbo_odbc.php
index 6cde21b24..a53687ad9 100644
--- a/cake/libs/model/datasources/dbo/dbo_odbc.php
+++ b/cake/libs/model/datasources/dbo/dbo_odbc.php
@@ -110,7 +110,7 @@ class DboOdbc extends DboSource {
  * Check if the ODBC extension is installed/loaded
  *
  * @return boolean
- **/
+ */
 	function enabled() {
 		return extension_loaded('odbc');
 	}
diff --git a/cake/libs/model/datasources/dbo/dbo_postgres.php b/cake/libs/model/datasources/dbo/dbo_postgres.php
index ac2861373..33c97c815 100644
--- a/cake/libs/model/datasources/dbo/dbo_postgres.php
+++ b/cake/libs/model/datasources/dbo/dbo_postgres.php
@@ -127,7 +127,7 @@ class DboPostgres extends DboSource {
  * Check if PostgreSQL is enabled/loaded
  *
  * @return boolean
- **/
+ */
 	function enabled() {
 		return extension_loaded('pgsql');
 	}
diff --git a/cake/libs/model/datasources/dbo/dbo_sqlite.php b/cake/libs/model/datasources/dbo/dbo_sqlite.php
index 0932303a6..f431f540c 100644
--- a/cake/libs/model/datasources/dbo/dbo_sqlite.php
+++ b/cake/libs/model/datasources/dbo/dbo_sqlite.php
@@ -141,7 +141,7 @@ class DboSqlite extends DboSource {
  * Check that SQLite is enabled/installed
  *
  * @return boolean
- **/
+ */
 	function enabled() {
 		return extension_loaded('sqlite');
 	}
diff --git a/cake/libs/model/datasources/dbo/dbo_sybase.php b/cake/libs/model/datasources/dbo/dbo_sybase.php
index 023beb28b..0551a92b3 100644
--- a/cake/libs/model/datasources/dbo/dbo_sybase.php
+++ b/cake/libs/model/datasources/dbo/dbo_sybase.php
@@ -109,7 +109,7 @@ class DboSybase extends DboSource {
  * Check that one of the sybase extensions is installed
  *
  * @return boolean
- **/
+ */
 	function enabled() {
 		return extension_loaded('sybase') || extension_loaded('sybase_ct');
 	}
diff --git a/cake/libs/model/datasources/dbo_source.php b/cake/libs/model/datasources/dbo_source.php
index 72bdbdc05..8fd796675 100644
--- a/cake/libs/model/datasources/dbo_source.php
+++ b/cake/libs/model/datasources/dbo_source.php
@@ -495,7 +495,7 @@ class DboSource extends DataSource {
  *
  * @param boolean $sorted Get the queries sorted by time taken, defaults to false.
  * @return array Array of queries run as an array
- **/
+ */
 	function getLog($sorted = false) {
 		if ($sorted) {
 			$log = sortByKey($this->_queriesLog, 'took', 'desc', SORT_NUMERIC);
@@ -967,7 +967,7 @@ class DboSource extends DataSource {
  * @param object $model Model being merged onto
  * @param object $linkModel Model being merged
  * @return void
- **/
+ */
 	function __mergeHasMany(&$resultSet, $merge, $association, &$model, &$linkModel) {
 		foreach ($resultSet as $i => $value) {
 			$count = 0;
@@ -2483,7 +2483,7 @@ class DboSource extends DataSource {
  * @param array $columnData The array of column data.
  * @param string $position The position type to use. 'beforeDefault' or 'afterDefault' are common
  * @return string a built column with the field parameters added.
- **/
+ */
 	function _buildFieldParameters($columnString, $columnData, $position) {
 		foreach ($this->fieldParameters as $paramName => $value) {
 			if (isset($columnData[$paramName]) && $value['position'] == $position) {
diff --git a/cake/libs/router.php b/cake/libs/router.php
index 3484c11d5..0b94b3907 100644
--- a/cake/libs/router.php
+++ b/cake/libs/router.php
@@ -161,7 +161,7 @@ class Router {
  * Builds __prefixes
  *
  * @return void
- **/
+ */
 	function Router() {
 		$this->__setPrefixes();
 	}
@@ -173,7 +173,7 @@ class Router {
  * @return void
  * @access private
  * @todo Remove support for Routing.admin in future versions.
- **/
+ */
 	function __setPrefixes() {
 		$routing = Configure::read('Routing');
 		if (!empty($routing['admin'])) {
diff --git a/cake/libs/view/helper.php b/cake/libs/view/helper.php
index c1c57f58d..030b17fe1 100644
--- a/cake/libs/view/helper.php
+++ b/cake/libs/view/helper.php
@@ -225,7 +225,7 @@ class Helper extends Overloadable {
  *
  * @param string $path The file path to timestamp, the path must be inside WWW_ROOT
  * @return string Path with a timestamp added, or not.
- **/
+ */
 	function assetTimestamp($path) {
 		$timestampEnabled = (
 			(Configure::read('Asset.timestamp') === true && Configure::read() > 0) ||
diff --git a/cake/libs/view/helpers/html.php b/cake/libs/view/helpers/html.php
index c7492558b..f86c84087 100644
--- a/cake/libs/view/helpers/html.php
+++ b/cake/libs/view/helpers/html.php
@@ -143,14 +143,14 @@ class HtmlHelper extends AppHelper {
  *
  * @var array
  * @access private
- **/
+ */
 	var $__includedScripts = array();
 /**
  * Options for the currently opened script block buffer if any.
  *
  * @var array
  * @access protected
- **/
+ */
 	var $_scriptBlockOptions = array();
 /**
  * Document type definitions
@@ -436,7 +436,7 @@ class HtmlHelper extends AppHelper {
  * @param mixed $options Array of options, and html attributes see above. If boolean sets $options['inline'] = value
  * @return mixed String of <script /> tags or null if $inline is false or if $once is true and the file has been
  *   included before.
- **/
+ */
 	function script($url, $options = array()) {
 		if (is_bool($options)) {
 			list($inline, $options) = array($options, array());
@@ -492,7 +492,7 @@ class HtmlHelper extends AppHelper {
  * @param string $script The script to wrap
  * @param array $options The options to use.
  * @return mixed string or null depending on the value of `$options['inline']`
- **/
+ */
 	function scriptBlock($script, $options = array()) {
 		$options += array('safe' => true, 'inline' => true);
 		if ($options['safe']) {
@@ -521,7 +521,7 @@ class HtmlHelper extends AppHelper {
  *
  * @param array $options Options for the code block.
  * @return void
- **/
+ */
 	function scriptStart($options = array()) {
 		$options += array('safe' => true, 'inline' => true);
 		$this->_scriptBlockOptions = $options;
@@ -534,7 +534,7 @@ class HtmlHelper extends AppHelper {
  * used when the scriptBlock was started
  *
  * @return mixed depending on the settings of scriptStart() either a script tag or null
- **/
+ */
 	function scriptEnd() {
 		$buffer = ob_get_clean();
 		$options = $this->_scriptBlockOptions;
diff --git a/cake/libs/view/helpers/javascript.php b/cake/libs/view/helpers/javascript.php
index 4fb814449..c4732a5ca 100644
--- a/cake/libs/view/helpers/javascript.php
+++ b/cake/libs/view/helpers/javascript.php
@@ -319,7 +319,7 @@ class JavascriptHelper extends AppHelper {
  * Encode a string into JSON.  Converts and escapes necessary characters.
  *
  * @return void
- **/
+ */
 	function _utf8ToHex($string) {
 		$length = strlen($string);
 		$return = '';
diff --git a/cake/libs/view/helpers/jquery_engine.php b/cake/libs/view/helpers/jquery_engine.php
index 3509ecd61..7c592f6e3 100644
--- a/cake/libs/view/helpers/jquery_engine.php
+++ b/cake/libs/view/helpers/jquery_engine.php
@@ -27,7 +27,7 @@ class JqueryEngineHelper extends JsBaseEngineHelper {
  * Option mappings for jQuery
  *
  * @var array
- **/
+ */
 	var $_optionMap = array(
 		'request' => array(
 			'type' => 'dataType',
@@ -55,7 +55,7 @@ class JqueryEngineHelper extends JsBaseEngineHelper {
  * callback arguments lists
  *
  * @var string
- **/
+ */
 	var $_callbackArguments = array(
 		'slider' => array(
 			'start' => 'event, ui',
@@ -103,7 +103,7 @@ class JqueryEngineHelper extends JsBaseEngineHelper {
  * when jQuery is put into noConflict() mode.
  *
  * @var string
- **/
+ */
 	 var $jQueryObject = '$';
 
 /**
@@ -116,7 +116,7 @@ class JqueryEngineHelper extends JsBaseEngineHelper {
  * @param string $callbacks Array of callback / special options.
  * @access public
  * @return string
- **/
+ */
 	function _methodTemplate($method, $template, $options, $extraSafeKeys = array()) {
 		$options = $this->_mapOptions($method, $options);
 		$options = $this->_prepareCallbacks($method, $options);
@@ -133,7 +133,7 @@ class JqueryEngineHelper extends JsBaseEngineHelper {
  *
  * @param string $selector The selector that is targeted
  * @return object instance of $this. Allows chained methods.
- **/
+ */
 	function get($selector) {
 		if ($selector == 'window' || $selector == 'document') {
 			$this->selection = $this->jQueryObject . '(' . $selector .')';
@@ -155,7 +155,7 @@ class JqueryEngineHelper extends JsBaseEngineHelper {
  * @param string $callback The Javascript function you wish to trigger or the function literal
  * @param array $options Options for the event.
  * @return string completed event handler
- **/
+ */
 	function event($type, $callback, $options = array()) {
 		$defaults = array('wrap' => true, 'stop' => true);
 		$options = array_merge($defaults, $options);
@@ -175,7 +175,7 @@ class JqueryEngineHelper extends JsBaseEngineHelper {
  *
  * @param string $functionBody The code to run on domReady
  * @return string completed domReady method
- **/
+ */
 	function domReady($functionBody) {
 		$this->get('document');
 		return $this->event('ready', $functionBody, array('stop' => false));
@@ -187,7 +187,7 @@ class JqueryEngineHelper extends JsBaseEngineHelper {
  * @param string $method The method you want to apply to the selection
  * @param string $callback The function body you wish to apply during the iteration.
  * @return string completed iteration
- **/
+ */
 	function each($callback) {
 		return $this->selection . '.each(function () {' . $callback . '});';
 	}
@@ -199,7 +199,7 @@ class JqueryEngineHelper extends JsBaseEngineHelper {
  * @param array $options Array of options for the effect.
  * @return string completed string with effect.
  * @see JsBaseEngineHelper::effect()
- **/
+ */
 	function effect($name, $options = array()) {
 		$speed = null;
 		if (isset($options['speed']) && in_array($options['speed'], array('fast', 'slow'))) {
@@ -230,7 +230,7 @@ class JqueryEngineHelper extends JsBaseEngineHelper {
  * @param mixed $url
  * @param array $options
  * @return string The completed ajax call.
- **/
+ */
 	function request($url, $options = array()) {
 		$url = $this->url($url);
 		$options = $this->_mapOptions('request', $options);
@@ -266,7 +266,7 @@ class JqueryEngineHelper extends JsBaseEngineHelper {
  * @param array $options Array of options for the sortable.
  * @return string Completed sortable script.
  * @see JsHelper::sortable() for options list.
- **/
+ */
 	function sortable($options = array()) {
 		$template = '%s.sortable({%s});';
 		return $this->_methodTemplate('sortable', $template, $options);
@@ -280,7 +280,7 @@ class JqueryEngineHelper extends JsBaseEngineHelper {
  * @param array $options Array of options for the draggable element.
  * @return string Completed Draggable script.
  * @see JsHelper::drag() for options list.
- **/
+ */
 	function drag($options = array()) {
 		$template = '%s.draggable({%s});';
 		return $this->_methodTemplate('drag', $template, $options);
@@ -294,7 +294,7 @@ class JqueryEngineHelper extends JsBaseEngineHelper {
  * @param array $options Array of options for the droppable element.
  * @return string Completed Droppable script.
  * @see JsHelper::drop() for options list.
- **/
+ */
 	function drop($options = array()) {
 		$template = '%s.droppable({%s});';
 		return $this->_methodTemplate('drop', $template, $options);
@@ -308,7 +308,7 @@ class JqueryEngineHelper extends JsBaseEngineHelper {
  * @param array $options Array of options for the droppable element.
  * @return string Completed Slider script.
  * @see JsHelper::slider() for options list.
- **/
+ */
 	function slider($options = array()) {
 		$callbacks = array('start', 'change', 'slide', 'stop');
 		$template = '%s.slider({%s});';
@@ -322,7 +322,7 @@ class JqueryEngineHelper extends JsBaseEngineHelper {
  * @param array $options Options for the serialization
  * @return string completed form serialization script
  * @see JsHelper::serializeForm() for option list.
- **/
+ */
 	function serializeForm($options = array()) {
 		$options = array_merge(array('isForm' => false, 'inline' => false), $options);
 		$selector = $this->selection;
diff --git a/cake/libs/view/helpers/js.php b/cake/libs/view/helpers/js.php
index d0ccb5689..1352074c8 100644
--- a/cake/libs/view/helpers/js.php
+++ b/cake/libs/view/helpers/js.php
@@ -26,20 +26,20 @@
  *
  * @package       cake
  * @subpackage    cake.cake.libs.view.helpers
- **/
+ */
 class JsHelper extends AppHelper {
 /**
  * Whether or not you want scripts to be buffered or output.
  *
  * @var boolean
- **/
+ */
 	var $bufferScripts = true;
 
 /**
  * helpers
  *
  * @var array
- **/
+ */
 	var $helpers = array('Html', 'Form');
 
 /**
@@ -47,14 +47,14 @@ class JsHelper extends AppHelper {
  *
  * @var array
  * @see JsHelper::set()
- **/
+ */
 	var $__jsVars = array();
 
 /**
  * Scripts that are queued for output
  *
  * @var array
- **/
+ */
 	var $__bufferedScripts = array();
 
 /**
@@ -62,14 +62,14 @@ class JsHelper extends AppHelper {
  *
  * @var string
  * @access private
- **/
+ */
 	var $__engineName;
 
 /**
  * The javascript variable created by set() variables.
  *
  * @var string
- **/
+ */
 	var $setVariable = APP_DIR;
 
 /**
@@ -78,7 +78,7 @@ class JsHelper extends AppHelper {
  * @param array $settings Settings array contains name of engine helper.
  * @access public
  * @return void
- **/
+ */
 	function __construct($settings = array()) {
 		$className = 'Jquery';
 		if (is_array($settings) && isset($settings[0])) {
@@ -115,7 +115,7 @@ class JsHelper extends AppHelper {
  * @param array $params Parameters for the method being called.
  * @access public
  * @return mixed Depends on the return of the dispatched method, or it could be an instance of the EngineHelper
- **/
+ */
 	function call__($method, $params) {
 		if (isset($this->{$this->__engineName}) && method_exists($this->{$this->__engineName}, $method)) {
 			$buffer = false;
@@ -158,7 +158,7 @@ class JsHelper extends AppHelper {
  * @param array $options Options to use for encoding JSON.  See JsBaseEngineHelper::object() for more details.
  * @return string encoded JSON
  * @deprecated Remove when support for PHP4 and Object::object are removed.
- **/
+ */
 	function object($data = array(), $options = array()) {
 		return $this->{$this->__engineName}->object($data, $options);
 	}
@@ -178,7 +178,7 @@ class JsHelper extends AppHelper {
  *
  * @param array $options options for the code block
  * @return string completed javascript tag.
- **/
+ */
 	function writeBuffer($options = array()) {
 		$defaults = array('onDomReady' => true, 'inline' => true, 'cache' => false, 'clear' => true, 'safe' => true);
 		$options = array_merge($defaults, $options);
@@ -208,7 +208,7 @@ class JsHelper extends AppHelper {
  * Write a script to the cached scripts.
  *
  * @return void
- **/
+ */
 	function buffer($script) {
 		$this->__bufferedScripts[] = $script;
 	}
@@ -218,7 +218,7 @@ class JsHelper extends AppHelper {
  *
  * @param boolean $clear Whether or not to clear the script caches (default true)
  * @return array Array of scripts added to the request.
- **/
+ */
 	function getBuffer($clear = true) {
 		$this->_createVars();
 		$scripts = $this->__bufferedScripts;
@@ -233,7 +233,7 @@ class JsHelper extends AppHelper {
  * Generates the object string for variables passed to javascript.
  *
  * @return string
- **/
+ */
 	function _createVars() {
 		if (!empty($this->__jsVars)) {
 			$setVar = (strpos($this->setVariable, '.')) ? $this->setVariable : 'var ' . $this->setVariable;
@@ -258,7 +258,7 @@ class JsHelper extends AppHelper {
  * @param mixed $url Mixed either a string URL or an cake url array.
  * @param array $options Options for both the HTML element and Js::request()
  * @return string Completed link. If buffering is disabled a script tag will be returned as well.
- **/
+ */
 	function link($title, $url = null, $options = array()) {
 		if (!isset($options['id'])) {
 			$options['id'] = 'link-' . intval(mt_rand());
@@ -293,7 +293,7 @@ class JsHelper extends AppHelper {
  * @param mixed $one
  * @param mixed $two
  * @return void
- **/
+ */
 	function set($one, $two = null) {
 		$data = null;
 		if (is_array($one)) {
@@ -322,7 +322,7 @@ class JsHelper extends AppHelper {
  * @param string $title The display text of the submit button.
  * @param array $options Array of options to use.
  * @return string Completed submit button.
- **/
+ */
 	function submit($caption = null, $options = array()) {
 		if (!isset($options['id'])) {
 			$options['id'] = 'submit-' . intval(mt_rand());
@@ -364,7 +364,7 @@ class JsHelper extends AppHelper {
  * @param array $options Options to filter.
  * @param array $additional Array of additional keys to extract and include in the return options array.
  * @return array Array of options for non-js.
- **/
+ */
 	function _getHtmlOptions(&$options, $additional = array()) {
 		$htmlKeys = array_merge(array('class', 'id', 'escape', 'onblur', 'onfocus', 'rel', 'title'), $additional);
 		$htmlOptions = array();
@@ -388,14 +388,14 @@ class JsHelper extends AppHelper {
  * Abstract Base Class for All JsEngines to extend. Provides generic methods.
  *
  * @package cake.view.helpers
- **/
+ */
 class JsBaseEngineHelper extends AppHelper {
 /**
  * Determines whether native JSON extension is used for encoding.  Set by object constructor.
  *
  * @var boolean
  * @access public
- **/
+ */
 	var $useNative = false;
 
 /**
@@ -403,7 +403,7 @@ class JsBaseEngineHelper extends AppHelper {
  *
  * @var string
  * @access public
- **/
+ */
 	var $selection;
 
 /**
@@ -412,7 +412,7 @@ class JsBaseEngineHelper extends AppHelper {
  * for end user use though.
  *
  * @var array
- **/
+ */
 	var $_optionMap = array();
 
 /**
@@ -420,21 +420,21 @@ class JsBaseEngineHelper extends AppHelper {
  * This allows specific 'end point' methods to be automatically buffered by the JsHelper.
  *
  * @var array
- **/
+ */
 	var $bufferedMethods = array('event', 'sortable', 'drag', 'drop', 'slider');
 
 /**
  * Contains a list of callback names -> default arguments.
  *
  * @var array
- **/
+ */
 	var $_callbackArguments = array();
 
 /**
  * Constructor.
  *
  * @return void
- **/
+ */
 	function __construct() {
 		$this->useNative = function_exists('json_encode');
 	}
@@ -445,7 +445,7 @@ class JsBaseEngineHelper extends AppHelper {
  * @param string $message Message you want to alter.
  * @access public
  * @return string completed alert()
- **/
+ */
 	function alert($message) {
 		return 'alert("' . $this->escape($message) . '");';
 	}
@@ -456,7 +456,7 @@ class JsBaseEngineHelper extends AppHelper {
  * @param  mixed $url
  * @param  array  $options
  * @return string completed redirect in javascript
- **/
+ */
 	function redirect($url = null) {
 		return 'window.location = "' . Router::url($url) . '";';
 	}
@@ -467,7 +467,7 @@ class JsBaseEngineHelper extends AppHelper {
  * @param string $message Message you want confirmed.
  * @access public
  * @return string completed confirm()
- **/
+ */
 	function confirm($message) {
 		return 'confirm("' . $this->escape($message) . '");';
 	}
@@ -479,7 +479,7 @@ class JsBaseEngineHelper extends AppHelper {
  * @param string $message Message to use in the confirm dialog.
  * @access public
  * @return string
- **/
+ */
 	function confirmReturn($message) {
 		$out = 'var _confirm = ' . $this->confirm($message);
 		$out .= "if (!_confirm) {\n\treturn false;\n}";
@@ -493,7 +493,7 @@ class JsBaseEngineHelper extends AppHelper {
  * @param string $default Default message
  * @access public
  * @return string completed prompt()
- **/
+ */
 	function prompt($message, $default = '') {
 		return 'prompt("' . $this->escape($message) . '", "' . $this->escape($default) . '");';
 	}
@@ -511,7 +511,7 @@ class JsBaseEngineHelper extends AppHelper {
  * @param array $options Set of options, see above.
  * @return string A JSON code block
  * @access public
- **/
+ */
 	function object($data = array(), $options = array()) {
 		$defaultOptions = array(
 			'prefix' => '', 'postfix' => '',
@@ -571,7 +571,7 @@ class JsBaseEngineHelper extends AppHelper {
  * @param boolean $quoteStrings If false, leaves string values unquoted
  * @return string a JavaScript-safe/JSON representation of $val
  * @access public
- **/
+ */
 	function value($val, $quoteString = true) {
 		switch (true) {
 			case (is_array($val) || is_object($val)):
@@ -611,7 +611,7 @@ class JsBaseEngineHelper extends AppHelper {
  * @param  string $script String that needs to get escaped.
  * @return string Escaped string.
  * @access public
- **/
+ */
 	function escape($string) {
 		App::import('Core', 'Multibyte');
 		return $this->_utf8ToHex($string);
@@ -621,7 +621,7 @@ class JsBaseEngineHelper extends AppHelper {
  * Encode a string into JSON.  Converts and escapes necessary characters.
  *
  * @return void
- **/
+ */
 	function _utf8ToHex($string) {
 		$length = strlen($string);
 		$return = '';
@@ -716,7 +716,7 @@ class JsBaseEngineHelper extends AppHelper {
  *
  * @param string $selector The selector that is targeted
  * @return object instance of $this. Allows chained methods.
- **/
+ */
 	function get($selector) {
 		trigger_error(sprintf(__('%s does not have get() implemented', true), get_class($this)), E_USER_WARNING);
 		return $this;
@@ -734,7 +734,7 @@ class JsBaseEngineHelper extends AppHelper {
  * @param string $callback The Javascript function you wish to trigger or the function literal
  * @param array $options Options for the event.
  * @return string completed event handler
- **/
+ */
 	function event($type, $callback, $options = array()) {
 		trigger_error(sprintf(__('%s does not have event() implemented', true), get_class($this)), E_USER_WARNING);
 	}
@@ -744,7 +744,7 @@ class JsBaseEngineHelper extends AppHelper {
  *
  * @param string $functionBody The code to run on domReady
  * @return string completed domReady method
- **/
+ */
 	function domReady($functionBody) {
 		trigger_error(sprintf(__('%s does not have domReady() implemented', true), get_class($this)), E_USER_WARNING);
 	}
@@ -754,7 +754,7 @@ class JsBaseEngineHelper extends AppHelper {
  *
  * @param string $callback The function body you wish to apply during the iteration.
  * @return string completed iteration
- **/
+ */
 	function each($callback) {
 		trigger_error(sprintf(__('%s does not have each() implemented', true), get_class($this)), E_USER_WARNING);
 	}
@@ -781,7 +781,7 @@ class JsBaseEngineHelper extends AppHelper {
  * @param string $name The name of the effect to trigger.
  * @param array $options Array of options for the effect.
  * @return string completed string with effect.
- **/
+ */
 	function effect($name, $options) {
 		trigger_error(sprintf(__('%s does not have effect() implemented', true), get_class($this)), E_USER_WARNING);
 	}
@@ -810,7 +810,7 @@ class JsBaseEngineHelper extends AppHelper {
  * @param mixed $url Array or String URL to target with the request.
  * @param array $options Array of options. See above for cross library supported options
  * @return string XHR request.
- **/
+ */
 	function request($url, $options = array()) {
 		trigger_error(sprintf(__('%s does not have request() implemented', true), get_class($this)), E_USER_WARNING);
 	}
@@ -833,7 +833,7 @@ class JsBaseEngineHelper extends AppHelper {
  *
  * @param array $options Options array see above.
  * @return string Completed drag script
- **/
+ */
 	function drag($options = array()) {
 		trigger_error(sprintf(__('%s does not have drag() implemented', true), get_class($this)), E_USER_WARNING);
 	}
@@ -854,7 +854,7 @@ class JsBaseEngineHelper extends AppHelper {
  * - `leave` - Event fired when a drag is removed from a drop zone without being dropped.
  *
  * @return string Completed drop script
- **/
+ */
 	function drop($options = array()) {
 		trigger_error(sprintf(__('%s does not have drop() implemented', true), get_class($this)), E_USER_WARNING);
 	}
@@ -878,7 +878,7 @@ class JsBaseEngineHelper extends AppHelper {
  *
  * @param array $options Array of options for the sortable. See above.
  * @return string Completed sortable script.
- **/
+ */
 	function sortable() {
 		trigger_error(sprintf(__('%s does not have sortable() implemented', true), get_class($this)), E_USER_WARNING);
 	}
@@ -901,7 +901,7 @@ class JsBaseEngineHelper extends AppHelper {
  * - `complete` - Fired when the user stops sliding the handle
  *
  * @return string Completed slider script
- **/
+ */
 	function slider() {
 		trigger_error(sprintf(__('%s does not have slider() implemented', true), get_class($this)), E_USER_WARNING);
 	}
@@ -919,7 +919,7 @@ class JsBaseEngineHelper extends AppHelper {
  *
  * @param array $options options for serialization generation.
  * @return string completed form serialization script
- **/
+ */
 	function serializeForm() {
 		trigger_error(
 			sprintf(__('%s does not have serializeForm() implemented', true), get_class($this)), E_USER_WARNING
@@ -935,7 +935,7 @@ class JsBaseEngineHelper extends AppHelper {
  * @param array $safeKeys Keys that should not be escaped.
  * @return string
  * @access protected
- **/
+ */
 	function _parseOptions($options, $safeKeys = array()) {
 		$out = array();
 		$safeKeys = array_flip($safeKeys);
@@ -957,7 +957,7 @@ class JsBaseEngineHelper extends AppHelper {
  * @param array $options Array of options to map.
  * @return array Array of mapped options.
  * @access protected
- **/
+ */
 	function _mapOptions($method, $options) {
 		if (!isset($this->_optionMap[$method])) {
 			return $options;
@@ -980,7 +980,7 @@ class JsBaseEngineHelper extends AppHelper {
  * @param string $callbacks Additional Keys that contain callbacks
  * @access protected
  * @return array Array of options with callbacks added.
- **/
+ */
 	function _prepareCallbacks($method, $options, $callbacks = array()) {
 		$wrapCallbacks = true;
 		if (isset($options['wrapCallbacks'])) {
@@ -1016,7 +1016,7 @@ class JsBaseEngineHelper extends AppHelper {
  * @param string $method Name of method processing options for.
  * @param array $options Array of options to process.
  * @return string Parsed options string.
- **/
+ */
 	function _processOptions($method, $options) {
 		$options = $this->_mapOptions($method, $options);
 		$options = $this->_prepareCallbacks($method, $options);
@@ -1030,7 +1030,7 @@ class JsBaseEngineHelper extends AppHelper {
  * @param array $parameters Array of parameters to convert to a query string
  * @return string Querystring fragment
  * @access protected
- **/
+ */
 	function _toQuerystring($parameters) {
 		$out = '';
 		$keys = array_keys($parameters);
diff --git a/cake/libs/view/helpers/mootools_engine.php b/cake/libs/view/helpers/mootools_engine.php
index 07b4587f2..7fe26e33b 100644
--- a/cake/libs/view/helpers/mootools_engine.php
+++ b/cake/libs/view/helpers/mootools_engine.php
@@ -32,7 +32,7 @@ class MootoolsEngineHelper extends JsBaseEngineHelper {
  * Option mappings for MooTools
  *
  * @var array
- **/
+ */
 	var $_optionMap = array(
 		'request' => array(
 			'complete' => 'onComplete',
@@ -70,7 +70,7 @@ class MootoolsEngineHelper extends JsBaseEngineHelper {
  * Contains a list of callback names -> default arguments.
  *
  * @var array
- **/
+ */
 	var $_callbackArguments = array(
 		'slider' => array(
 			'onTick' => 'position',
@@ -116,7 +116,7 @@ class MootoolsEngineHelper extends JsBaseEngineHelper {
  *
  * @param string $selector The selector that is targeted
  * @return object instance of $this. Allows chained methods.
- **/
+ */
 	function get($selector) {
 		$this->_multipleSelection = false;
 		if ($selector == 'window' || $selector == 'document') {
@@ -144,7 +144,7 @@ class MootoolsEngineHelper extends JsBaseEngineHelper {
  * @param string $callback The Javascript function you wish to trigger or the function literal
  * @param array $options Options for the event.
  * @return string completed event handler
- **/
+ */
 	function event($type, $callback, $options = array()) {
 		$defaults = array('wrap' => true, 'stop' => true);
 		$options = array_merge($defaults, $options);
@@ -165,7 +165,7 @@ class MootoolsEngineHelper extends JsBaseEngineHelper {
  *
  * @param string $functionBody The code to run on domReady
  * @return string completed domReady method
- **/
+ */
 	function domReady($functionBody) {
 		$this->selection = 'window';
 		return $this->event('domready', $functionBody, array('stop' => false));
@@ -177,7 +177,7 @@ class MootoolsEngineHelper extends JsBaseEngineHelper {
  * @param string $method The method you want to apply to the selection
  * @param string $callback The function body you wish to apply during the iteration.
  * @return string completed iteration
- **/
+ */
 	function each($callback) {
 		return $this->selection . '.each(function (item, index) {' . $callback . '});';
 	}
@@ -189,7 +189,7 @@ class MootoolsEngineHelper extends JsBaseEngineHelper {
  * @param array $options Array of options for the effect.
  * @return string completed string with effect.
  * @see JsBaseEngineHelper::effect()
- **/
+ */
 	function effect($name, $options = array()) {
 		$speed = null;
 		if (isset($options['speed']) && in_array($options['speed'], array('fast', 'slow'))) {
@@ -231,7 +231,7 @@ class MootoolsEngineHelper extends JsBaseEngineHelper {
  * @param mixed $url
  * @param array $options
  * @return string The completed ajax call.
- **/
+ */
 	function request($url, $options = array()) {
 		$url = $this->url($url);
 		$options = $this->_mapOptions('request', $options);
@@ -270,7 +270,7 @@ class MootoolsEngineHelper extends JsBaseEngineHelper {
  * @param array $options Array of options for the sortable.
  * @return string Completed sortable script.
  * @see JsHelper::sortable() for options list.
- **/
+ */
 	function sortable($options = array()) {
 		$options = $this->_processOptions('sortable', $options);
 		return 'var jsSortable = new Sortables(' . $this->selection . ', {' . $options . '});';
@@ -284,7 +284,7 @@ class MootoolsEngineHelper extends JsBaseEngineHelper {
  * @param array $options Array of options for the draggable.
  * @return string Completed draggable script.
  * @see JsHelper::drag() for options list.
- **/
+ */
 	function drag($options = array()) {
 		$options = $this->_processOptions('drag', $options);
 		return $this->selection . '.makeDraggable({' . $options . '});';
@@ -303,7 +303,7 @@ class MootoolsEngineHelper extends JsBaseEngineHelper {
  * @param array $options Array of options for the droppable.
  * @return string Completed droppable script.
  * @see JsHelper::drop() for options list.
- **/
+ */
 	function drop($options = array()) {
 		if (empty($options['drag'])) {
 			trigger_error(
@@ -333,7 +333,7 @@ class MootoolsEngineHelper extends JsBaseEngineHelper {
  * @param array $options Array of options for the slider.
  * @return string Completed slider script.
  * @see JsHelper::slider() for options list.
- **/
+ */
 	function slider($options = array()) {
 		$slider = $this->selection;
 		$this->get($options['handle']);
@@ -358,7 +358,7 @@ class MootoolsEngineHelper extends JsBaseEngineHelper {
  * @param array $options Array of options.
  * @return string Completed serializeForm() snippet
  * @see JsHelper::serializeForm()
- **/
+ */
 	function serializeForm($options = array()) {
 		$options = array_merge(array('isForm' => false, 'inline' => false), $options);
 		$selection = $this->selection;
diff --git a/cake/libs/view/helpers/number.php b/cake/libs/view/helpers/number.php
index 959ab3afa..6503c234e 100644
--- a/cake/libs/view/helpers/number.php
+++ b/cake/libs/view/helpers/number.php
@@ -36,7 +36,7 @@ class NumberHelper extends AppHelper {
  *
  * @var array
  * @access protected
- **/
+ */
 	var $_currencies = array(
 		'USD' => array(
 			'before' => '$', 'after' => 'c', 'zero' => 0, 'places' => 2, 'thousands' => ',',
@@ -57,7 +57,7 @@ class NumberHelper extends AppHelper {
  *
  * @var array
  * @access protected
- **/
+ */
 	var $_currencyDefaults = array(
 		'before'=>'', 'after' => '', 'zero' => '0', 'places' => 2, 'thousands' => ',',
 		'decimals' => '.','negative' => '()', 'escape' => true
@@ -222,7 +222,7 @@ class NumberHelper extends AppHelper {
  * @param string $formatName The format name to be used in the future.
  * @param array $options The array of options for this format.
  * @return void
- **/
+ */
 	function addFormat($formatName, $options) {
 		$this->_currencies[$formatName] = $options + $this->_currencyDefaults;
 	}
diff --git a/cake/libs/view/helpers/paginator.php b/cake/libs/view/helpers/paginator.php
index 547385f22..45ffb488d 100644
--- a/cake/libs/view/helpers/paginator.php
+++ b/cake/libs/view/helpers/paginator.php
@@ -46,7 +46,7 @@ class PaginatorHelper extends AppHelper {
  * The class used for 'Ajax' pagination links.
  *
  * @var string
- **/
+ */
 	var $_ajaxHelperClass = 'Js';
 
 /**
@@ -83,7 +83,7 @@ class PaginatorHelper extends AppHelper {
  * The chosen custom helper must implement a `link()` method.
  *
  * @return void
- **/
+ */
 	function __construct($config = array()) {
 		$ajaxProvider = isset($config['ajax']) ? $config['ajax'] : 'Js';
 		$this->helpers[] = $ajaxProvider;
diff --git a/cake/libs/view/helpers/prototype_engine.php b/cake/libs/view/helpers/prototype_engine.php
index 090946281..cc5aeb041 100644
--- a/cake/libs/view/helpers/prototype_engine.php
+++ b/cake/libs/view/helpers/prototype_engine.php
@@ -27,13 +27,13 @@ class PrototypeEngineHelper extends JsBaseEngineHelper {
  * Is the current selection a multiple selection? or is it just a single element.
  *
  * @var boolean
- **/
+ */
 	var $_multiple = false;
 /**
  * Option mappings for Prototype
  *
  * @var array
- **/
+ */
 	var $_optionMap = array(
 		'request' => array(
 			'async' => 'asynchronous',
@@ -73,7 +73,7 @@ class PrototypeEngineHelper extends JsBaseEngineHelper {
  * Contains a list of callback names -> default arguments.
  *
  * @var array
- **/
+ */
 	var $_callbackArguments = array(
 		'slider' => array(
 			'onSlide' => 'value',
@@ -108,7 +108,7 @@ class PrototypeEngineHelper extends JsBaseEngineHelper {
  *
  * @param string $selector The selector that is targeted
  * @return object instance of $this. Allows chained methods.
- **/
+ */
 	function get($selector) {
 		$this->_multiple = false;
 		if ($selector == 'window' || $selector == 'document') {
@@ -135,7 +135,7 @@ class PrototypeEngineHelper extends JsBaseEngineHelper {
  * @param string $callback The Javascript function you wish to trigger or the function literal
  * @param array $options Options for the event.
  * @return string completed event handler
- **/
+ */
 	function event($type, $callback, $options = array()) {
 		$defaults = array('wrap' => true, 'stop' => true);
 		$options = array_merge($defaults, $options);
@@ -155,7 +155,7 @@ class PrototypeEngineHelper extends JsBaseEngineHelper {
  *
  * @param string $functionBody The code to run on domReady
  * @return string completed domReady method
- **/
+ */
 	function domReady($functionBody) {
 		$this->selection = 'document';
 		return $this->event('dom:loaded', $functionBody, array('stop' => false));
@@ -166,7 +166,7 @@ class PrototypeEngineHelper extends JsBaseEngineHelper {
  * @param string $method The method you want to apply to the selection
  * @param string $callback The function body you wish to apply during the iteration.
  * @return string completed iteration
- **/
+ */
 	function each($callback) {
 		return $this->selection . '.each(function (item, index) {' . $callback . '});';
 	}
@@ -179,7 +179,7 @@ class PrototypeEngineHelper extends JsBaseEngineHelper {
  * @param array $options Array of options for the effect.
  * @return string completed string with effect.
  * @see JsBaseEngineHelper::effect()
- **/
+ */
 	function effect($name, $options = array()) {
 		$effect = '';
 		$optionString = null;
@@ -220,7 +220,7 @@ class PrototypeEngineHelper extends JsBaseEngineHelper {
  * @param mixed $url
  * @param array $options
  * @return string The completed ajax call.
- **/
+ */
 	function request($url, $options = array()) {
 		$url = '"'. $this->url($url) . '"';
 		$options = $this->_mapOptions('request', $options);
@@ -255,7 +255,7 @@ class PrototypeEngineHelper extends JsBaseEngineHelper {
  * @param array $options Array of options for the sortable.
  * @return string Completed sortable script.
  * @see JsHelper::sortable() for options list.
- **/
+ */
 	function sortable($options = array()) {
 		$options = $this->_processOptions('sortable', $options);
 		if (!empty($options)) {
@@ -271,7 +271,7 @@ class PrototypeEngineHelper extends JsBaseEngineHelper {
  * @param array $options Array of options for the draggable.
  * @return string Completed draggable script.
  * @see JsHelper::draggable() for options list.
- **/
+ */
 	function drag($options = array()) {
 		$options = $this->_processOptions('drag', $options);
 		if (!empty($options)) {
@@ -290,7 +290,7 @@ class PrototypeEngineHelper extends JsBaseEngineHelper {
  * @param array $options Array of options for the droppable.
  * @return string Completed droppable script.
  * @see JsHelper::droppable() for options list.
- **/
+ */
 	function drop($options = array()) {
 		$options = $this->_processOptions('drop', $options);
 		if (!empty($options)) {
@@ -306,7 +306,7 @@ class PrototypeEngineHelper extends JsBaseEngineHelper {
  * @param array $options Array of options for the slider.
  * @return string Completed slider script.
  * @see JsHelper::slider() for options list.
- **/
+ */
 	function slider($options = array()) {
 		$slider = $this->selection;
 		$this->get($options['handle']);
@@ -330,7 +330,7 @@ class PrototypeEngineHelper extends JsBaseEngineHelper {
  * @param array $options Array of options.
  * @return string Completed serializeForm() snippet
  * @see JsHelper::serializeForm()
- **/
+ */
 	function serializeForm($options = array()) {
 		$options = array_merge(array('isForm' => false, 'inline' => false), $options);
 		$selection = $this->selection;
diff --git a/cake/libs/view/helpers/rss.php b/cake/libs/view/helpers/rss.php
index 6938a1b19..c0bc776c2 100644
--- a/cake/libs/view/helpers/rss.php
+++ b/cake/libs/view/helpers/rss.php
@@ -34,7 +34,7 @@ class RssHelper extends XmlHelper {
  *
  * @var array
  * @access public
- **/
+ */
 	var $helpers = array('Time');
 
 /**
diff --git a/cake/libs/view/view.php b/cake/libs/view/view.php
index 970341f7c..af8d49127 100644
--- a/cake/libs/view/view.php
+++ b/cake/libs/view/view.php
@@ -252,7 +252,7 @@ class View extends Object {
  * Holds View output.
  *
  * @var string
- **/
+ */
 	var $output = false;
 
 /**
diff --git a/cake/tests/cases/basics.test.php b/cake/tests/cases/basics.test.php
index 75c21f523..eb87b7b00 100644
--- a/cake/tests/cases/basics.test.php
+++ b/cake/tests/cases/basics.test.php
@@ -33,8 +33,8 @@ class BasicsTest extends CakeTestCase {
 /**
  * setUp method
  *
- * @access public
  * @return void
+ * @access public
  */
 	function setUp() {
 		App::build(array(
@@ -46,8 +46,8 @@ class BasicsTest extends CakeTestCase {
 /**
  * tearDown method
  *
- * @access public
  * @return void
+ * @access public
  */
 	function tearDown() {
 		App::build();
@@ -58,7 +58,8 @@ class BasicsTest extends CakeTestCase {
  * test the array_diff_key compatibility function.
  *
  * @return void
- **/
+ * @access public
+ */
 	function testArrayDiffKey() {
 		$one = array('one' => 1, 'two' => 2, 'three' => 3);
 		$two = array('one' => 'one', 'two' => 'two');
@@ -175,8 +176,8 @@ class BasicsTest extends CakeTestCase {
 /**
  * test uses()
  *
- * @access public
  * @return void
+ * @access public
  * @deprecated
  */
 	function testUses() {
@@ -194,8 +195,8 @@ class BasicsTest extends CakeTestCase {
 /**
  * Test h()
  *
- * @access public
  * @return void
+ * @access public
  */
 	function testH() {
 		$string = '<foo>';
@@ -211,8 +212,8 @@ class BasicsTest extends CakeTestCase {
 /**
  * Test a()
  *
- * @access public
  * @return void
+ * @access public
  */
 	function testA() {
 		$result = a('this', 'that', 'bar');
@@ -222,8 +223,8 @@ class BasicsTest extends CakeTestCase {
 /**
  * Test aa()
  *
- * @access public
  * @return void
+ * @access public
  */
 	function testAa() {
 		$result = aa('a', 'b', 'c', 'd');
@@ -238,8 +239,8 @@ class BasicsTest extends CakeTestCase {
 /**
  * Test am()
  *
- * @access public
  * @return void
+ * @access public
  */
 	function testAm() {
 		$result = am(array('one', 'two'), 2, 3, 4);
@@ -254,8 +255,8 @@ class BasicsTest extends CakeTestCase {
 /**
  * test cache()
  *
- * @access public
  * @return void
+ * @access public
  */
 	function testCache() {
 		$_cacheDisable = Configure::read('Cache.disable');
@@ -290,8 +291,8 @@ class BasicsTest extends CakeTestCase {
 /**
  * test clearCache()
  *
- * @access public
  * @return void
+ * @access public
  */
 	function testClearCache() {
 		$cacheOff = Configure::read('Cache.disable');
@@ -338,8 +339,8 @@ class BasicsTest extends CakeTestCase {
 /**
  * test __()
  *
- * @access public
  * @return void
+ * @access public
  */
 	function test__() {
 		Configure::write('Config.language', 'rule_1_po');
@@ -362,8 +363,8 @@ class BasicsTest extends CakeTestCase {
 /**
  * test __n()
  *
- * @access public
  * @return void
+ * @access public
  */
 	function test__n() {
 		Configure::write('Config.language', 'rule_1_po');
@@ -390,8 +391,8 @@ class BasicsTest extends CakeTestCase {
 /**
  * test __d()
  *
- * @access public
  * @return void
+ * @access public
  */
 	function test__d() {
 		Configure::write('Config.language', 'rule_1_po');
@@ -418,8 +419,8 @@ class BasicsTest extends CakeTestCase {
 /**
  * test __dn()
  *
- * @access public
  * @return void
+ * @access public
  */
 	function test__dn() {
 		Configure::write('Config.language', 'rule_1_po');
@@ -450,8 +451,8 @@ class BasicsTest extends CakeTestCase {
 /**
  * test __c()
  *
- * @access public
  * @return void
+ * @access public
  */
 	function test__c() {
 		Configure::write('Config.language', 'rule_1_po');
@@ -474,8 +475,8 @@ class BasicsTest extends CakeTestCase {
 /**
  * test __dc()
  *
- * @access public
  * @return void
+ * @access public
  */
 	function test__dc() {
 		Configure::write('Config.language', 'rule_1_po');
@@ -506,8 +507,8 @@ class BasicsTest extends CakeTestCase {
 /**
  * test __dcn()
  *
- * @access public
  * @return void
+ * @access public
  */
 	function test__dcn() {
 		Configure::write('Config.language', 'rule_1_po');
@@ -534,8 +535,8 @@ class BasicsTest extends CakeTestCase {
 /**
  * test LogError()
  *
- * @access public
  * @return void
+ * @access public
  */
 	function testLogError() {
 		@unlink(LOGS . 'error.log');
@@ -552,8 +553,8 @@ class BasicsTest extends CakeTestCase {
 /**
  * test fileExistsInPath()
  *
- * @access public
  * @return void
+ * @access public
  */
 	function testFileExistsInPath() {
 		$this->skipUnless(function_exists('ini_set'), '%s ini_set function not available');
@@ -597,8 +598,8 @@ class BasicsTest extends CakeTestCase {
 /**
  * test convertSlash()
  *
- * @access public
  * @return void
+ * @access public
  */
 	function testConvertSlash() {
 		$result = convertSlash('\path\to\location\\');
@@ -613,8 +614,8 @@ class BasicsTest extends CakeTestCase {
 /**
  * test debug()
  *
- * @access public
  * @return void
+ * @access public
  */
 	function testDebug() {
 		ob_start();
@@ -637,8 +638,8 @@ class BasicsTest extends CakeTestCase {
 /**
  * test pr()
  *
- * @access public
  * @return void
+ * @access public
  */
 	function testPr() {
 		ob_start();
@@ -657,8 +658,8 @@ class BasicsTest extends CakeTestCase {
 /**
  * test params()
  *
- * @access public
  * @return void
+ * @access public
  */
 	function testParams() {
 		$this->assertNull(params('weekend'));
@@ -675,8 +676,8 @@ class BasicsTest extends CakeTestCase {
 /**
  * test stripslashes_deep()
  *
- * @access public
  * @return void
+ * @access public
  */
 	function testStripslashesDeep() {
 		$this->skipIf(ini_get('magic_quotes_sybase') === '1', '%s magic_quotes_sybase is on');
@@ -713,8 +714,8 @@ class BasicsTest extends CakeTestCase {
 /**
  * test stripslashes_deep() with magic_quotes_sybase on
  *
- * @access public
  * @return void
+ * @access public
  */
 	function testStripslashesDeepSybase() {
 		$this->skipUnless(ini_get('magic_quotes_sybase') === '1', '%s magic_quotes_sybase is off');
@@ -747,8 +748,8 @@ class BasicsTest extends CakeTestCase {
 /**
  * test ife()
  *
- * @access public
  * @return void
+ * @access public
  */
 	function testIfe() {
 		$this->assertEqual(ife(true, 'a', 'b'), 'a');
diff --git a/cake/tests/cases/dispatcher.test.php b/cake/tests/cases/dispatcher.test.php
index be2134d4e..4838cabc2 100644
--- a/cake/tests/cases/dispatcher.test.php
+++ b/cake/tests/cases/dispatcher.test.php
@@ -41,8 +41,8 @@ class TestDispatcher extends Dispatcher {
  * @param mixed $controller
  * @param mixed $params
  * @param mixed $missingAction
- * @access protected
  * @return void
+ * @access protected
  */
 	function _invoke(&$controller, $params) {
 		restore_error_handler();
@@ -60,8 +60,8 @@ class TestDispatcher extends Dispatcher {
  * cakeError method
  *
  * @param mixed $filename
- * @access public
  * @return void
+ * @access public
  */
 	function cakeError($filename, $params) {
 		return array($filename, $params);
@@ -70,8 +70,8 @@ class TestDispatcher extends Dispatcher {
 /**
  * _stop method
  *
- * @access protected
  * @return void
+ * @access protected
  */
 	function _stop() {
 		return true;
@@ -114,8 +114,8 @@ class MyPluginController extends MyPluginAppController {
 /**
  * index method
  *
- * @access public
  * @return void
+ * @access public
  */
 	function index() {
 		return true;
@@ -124,8 +124,8 @@ class MyPluginController extends MyPluginAppController {
 /**
  * add method
  *
- * @access public
  * @return void
+ * @access public
  */
 	function add() {
 		return true;
@@ -135,8 +135,8 @@ class MyPluginController extends MyPluginAppController {
  * admin_add method
  *
  * @param mixed $id
- * @access public
  * @return void
+ * @access public
  */
 	function admin_add($id = null) {
 		return $id;
@@ -171,8 +171,8 @@ class SomePagesController extends AppController {
  * display method
  *
  * @param mixed $page
- * @access public
  * @return void
+ * @access public
  */
 	function display($page = null) {
 		return $page;
@@ -181,8 +181,8 @@ class SomePagesController extends AppController {
 /**
  * index method
  *
- * @access public
  * @return void
+ * @access public
  */
 	function index() {
 		return true;
@@ -191,8 +191,8 @@ class SomePagesController extends AppController {
 /**
  * protected method
  *
- * @access protected
  * @return void
+ * @access protected
  */
 	function _protected() {
 		return true;
@@ -201,8 +201,8 @@ class SomePagesController extends AppController {
 /**
  * redirect method overriding
  *
- * @access public
  * @return void
+ * @access public
  */
 	function redirect() {
 		echo 'this should not be accessible';
@@ -237,8 +237,8 @@ class OtherPagesController extends MyPluginAppController {
  * display method
  *
  * @param mixed $page
- * @access public
  * @return void
+ * @access public
  */
 	function display($page = null) {
 		return $page;
@@ -247,8 +247,8 @@ class OtherPagesController extends MyPluginAppController {
 /**
  * index method
  *
- * @access public
  * @return void
+ * @access public
  */
 	function index() {
 		return true;
@@ -282,8 +282,8 @@ class TestDispatchPagesController extends AppController {
 /**
  * admin_index method
  *
- * @access public
  * @return void
+ * @access public
  */
 	function admin_index() {
 		return true;
@@ -292,8 +292,8 @@ class TestDispatchPagesController extends AppController {
 /**
  * camelCased method
  *
- * @access public
  * @return void
+ * @access public
  */
 	function camelCased() {
 		return true;
@@ -336,8 +336,8 @@ class ArticlesTestController extends ArticlesTestAppController {
 /**
  * admin_index method
  *
- * @access public
  * @return void
+ * @access public
  */
 	function admin_index() {
 		return true;
@@ -379,8 +379,8 @@ class SomePostsController extends AppController {
 /**
  * beforeFilter method
  *
- * @access public
  * @return void
+ * @access public
  */
 	function beforeFilter() {
 		if ($this->params['action'] == 'index') {
@@ -394,8 +394,8 @@ class SomePostsController extends AppController {
 /**
  * index method
  *
- * @access public
  * @return void
+ * @access public
  */
 	function index() {
 		return true;
@@ -404,8 +404,8 @@ class SomePostsController extends AppController {
 /**
  * change method
  *
- * @access public
  * @return void
+ * @access public
  */
 	function change() {
 		return true;
@@ -466,8 +466,8 @@ class TestCachedPagesController extends AppController {
 /**
  * index method
  *
- * @access public
  * @return void
+ * @access public
  */
 	function index() {
 		$this->render();
@@ -476,8 +476,8 @@ class TestCachedPagesController extends AppController {
 /**
  * test_nocache_tags method
  *
- * @access public
  * @return void
+ * @access public
  */
 	function test_nocache_tags() {
 		$this->render();
@@ -486,8 +486,8 @@ class TestCachedPagesController extends AppController {
 /**
  * view method
  *
- * @access public
  * @return void
+ * @access public
  */
 	function view($id = null) {
 		$this->render('index');
@@ -521,8 +521,8 @@ class TimesheetsController extends AppController {
 /**
  * index method
  *
- * @access public
  * @return void
+ * @access public
  */
 	function index() {
 		return true;
@@ -540,8 +540,8 @@ class DispatcherTest extends CakeTestCase {
 /**
  * setUp method
  *
- * @access public
  * @return void
+ * @access public
  */
 	function startTest() {
 		$this->_get = $_GET;
@@ -567,8 +567,8 @@ class DispatcherTest extends CakeTestCase {
 /**
  * tearDown method
  *
- * @access public
  * @return void
+ * @access public
  */
 	function endTest() {
 		$_GET = $this->_get;
@@ -584,8 +584,8 @@ class DispatcherTest extends CakeTestCase {
 /**
  * testParseParamsWithoutZerosAndEmptyPost method
  *
- * @access public
  * @return void
+ * @access public
  */
 	function testParseParamsWithoutZerosAndEmptyPost() {
 		$Dispatcher =& new Dispatcher();
@@ -601,8 +601,8 @@ class DispatcherTest extends CakeTestCase {
 /**
  * testParseParamsReturnsPostedData method
  *
- * @access public
  * @return void
+ * @access public
  */
 	function testParseParamsReturnsPostedData() {
 		$_POST['testdata'] = "My Posted Content";
@@ -615,8 +615,8 @@ class DispatcherTest extends CakeTestCase {
 /**
  * testParseParamsWithSingleZero method
  *
- * @access public
  * @return void
+ * @access public
  */
 	function testParseParamsWithSingleZero() {
 		$Dispatcher =& new Dispatcher();
@@ -631,8 +631,8 @@ class DispatcherTest extends CakeTestCase {
 /**
  * testParseParamsWithManySingleZeros method
  *
- * @access public
  * @return void
+ * @access public
  */
 	function testParseParamsWithManySingleZeros() {
 		$Dispatcher =& new Dispatcher();
@@ -648,8 +648,8 @@ class DispatcherTest extends CakeTestCase {
 /**
  * testParseParamsWithManyZerosInEachSectionOfUrl method
  *
- * @access public
  * @return void
+ * @access public
  */
 	function testParseParamsWithManyZerosInEachSectionOfUrl() {
 		$Dispatcher =& new Dispatcher();
@@ -665,8 +665,8 @@ class DispatcherTest extends CakeTestCase {
 /**
  * testParseParamsWithMixedOneToManyZerosInEachSectionOfUrl method
  *
- * @access public
  * @return void
+ * @access public
  */
 	function testParseParamsWithMixedOneToManyZerosInEachSectionOfUrl() {
 		$Dispatcher =& new Dispatcher();
@@ -682,8 +682,8 @@ class DispatcherTest extends CakeTestCase {
 /**
  * testQueryStringOnRoot method
  *
- * @access public
  * @return void
+ * @access public
  */
 	function testQueryStringOnRoot() {
 		Router::reload();
@@ -712,8 +712,8 @@ class DispatcherTest extends CakeTestCase {
 /**
  * testFileUploadArrayStructure method
  *
- * @access public
  * @return void
+ * @access public
  */
 	function testFileUploadArrayStructure() {
 		$_FILES = array('data' => array('name' => array(
@@ -965,8 +965,8 @@ class DispatcherTest extends CakeTestCase {
 /**
  * testGetUrl method
  *
- * @access public
  * @return void
+ * @access public
  */
 	function testGetUrl() {
 		$Dispatcher =& new Dispatcher();
@@ -1005,8 +1005,8 @@ class DispatcherTest extends CakeTestCase {
 /**
  * testBaseUrlAndWebrootWithModRewrite method
  *
- * @access public
  * @return void
+ * @access public
  */
 	function testBaseUrlAndWebrootWithModRewrite() {
 		$Dispatcher =& new Dispatcher();
@@ -1081,8 +1081,8 @@ class DispatcherTest extends CakeTestCase {
 /**
  * testBaseUrlwithModRewriteAlias method
  *
- * @access public
  * @return void
+ * @access public
  */
 	function testBaseUrlwithModRewriteAlias() {
 		$_SERVER['DOCUMENT_ROOT'] = '/home/aplusnur/public_html';
@@ -1116,8 +1116,8 @@ class DispatcherTest extends CakeTestCase {
 /**
  * testBaseUrlAndWebrootWithBaseUrl method
  *
- * @access public
  * @return void
+ * @access public
  */
 	function testBaseUrlAndWebrootWithBaseUrl() {
 		$Dispatcher =& new Dispatcher();
@@ -1186,8 +1186,8 @@ class DispatcherTest extends CakeTestCase {
 /**
  * testBaseUrlAndWebrootWithBase method
  *
- * @access public
  * @return void
+ * @access public
  */
 	function testBaseUrlAndWebrootWithBase() {
 		$Dispatcher =& new Dispatcher();
@@ -1217,8 +1217,8 @@ class DispatcherTest extends CakeTestCase {
 /**
  * testMissingController method
  *
- * @access public
  * @return void
+ * @access public
  */
 	function testMissingController() {
 		$Dispatcher =& new TestDispatcher();
@@ -1237,8 +1237,8 @@ class DispatcherTest extends CakeTestCase {
 /**
  * testPrivate method
  *
- * @access public
  * @return void
+ * @access public
  */
 	function testPrivate() {
 		$Dispatcher =& new TestDispatcher();
@@ -1260,8 +1260,8 @@ class DispatcherTest extends CakeTestCase {
 /**
  * testMissingAction method
  *
- * @access public
  * @return void
+ * @access public
  */
 	function testMissingAction() {
 		$Dispatcher =& new TestDispatcher();
@@ -1298,8 +1298,8 @@ class DispatcherTest extends CakeTestCase {
 /**
  * testDispatch method
  *
- * @access public
  * @return void
+ * @access public
  */
 	function testDispatch() {
 		$Dispatcher =& new TestDispatcher();
@@ -1353,8 +1353,8 @@ class DispatcherTest extends CakeTestCase {
 /**
  * testDispatchWithArray method
  *
- * @access public
  * @return void
+ * @access public
  */
 	function testDispatchWithArray() {
 		$Dispatcher =& new TestDispatcher();
@@ -1373,8 +1373,8 @@ class DispatcherTest extends CakeTestCase {
 /**
  * testAdminDispatch method
  *
- * @access public
  * @return void
+ * @access public
  */
 	function testAdminDispatch() {
 		$_POST = array();
@@ -1404,8 +1404,8 @@ class DispatcherTest extends CakeTestCase {
 /**
  * testPluginDispatch method
  *
- * @access public
  * @return void
+ * @access public
  */
 	function testPluginDispatch() {
 		$_POST = array();
@@ -1453,8 +1453,8 @@ class DispatcherTest extends CakeTestCase {
 /**
  * testAutomaticPluginDispatch method
  *
- * @access public
  * @return void
+ * @access public
  */
 	function testAutomaticPluginDispatch() {
 		$_POST = array();
@@ -1491,8 +1491,8 @@ class DispatcherTest extends CakeTestCase {
 /**
  * testAutomaticPluginControllerDispatch method
  *
- * @access public
  * @return void
+ * @access public
  */
 	function testAutomaticPluginControllerDispatch() {
 		$_POST = array();
@@ -1594,7 +1594,8 @@ class DispatcherTest extends CakeTestCase {
  * plugin short form instead.
  *
  * @return void
- **/
+ * @access public
+ */
 	function testAutomaticPluginDispatchWithShortAccess() {
 		$_POST = array();
 		$_SERVER['PHP_SELF'] = '/cake/repo/branches/1.2.x.x/index.php';
@@ -1642,8 +1643,8 @@ class DispatcherTest extends CakeTestCase {
 /**
  * testAutomaticPluginControllerMissingActionDispatch method
  *
- * @access public
  * @return void
+ * @access public
  */
 	function testAutomaticPluginControllerMissingActionDispatch() {
 		$_POST = array();
@@ -1685,8 +1686,8 @@ class DispatcherTest extends CakeTestCase {
 /**
  * testPrefixProtection method
  *
- * @access public
  * @return void
+ * @access public
  */
 	function testPrefixProtection() {
 		$_POST = array();
@@ -1715,7 +1716,8 @@ class DispatcherTest extends CakeTestCase {
  * undocumented function
  *
  * @return void
- **/
+ * @access public
+ */
 	function testTestPluginDispatch() {
 		$Dispatcher =& new TestDispatcher();
 		App::build(array(
@@ -1734,8 +1736,8 @@ class DispatcherTest extends CakeTestCase {
 /**
  * testChangingParamsFromBeforeFilter method
  *
- * @access public
  * @return void
+ * @access public
  */
 	function testChangingParamsFromBeforeFilter() {
 		$_SERVER['PHP_SELF'] = '/cake/repo/branches/1.2.x.x/index.php';
@@ -1768,8 +1770,8 @@ class DispatcherTest extends CakeTestCase {
 /**
  * testStaticAssets method
  *
- * @access public
  * @return void
+ * @access public
  */
 	function testStaticAssets() {
 		Router::reload();
@@ -1845,8 +1847,8 @@ class DispatcherTest extends CakeTestCase {
 /**
  * testFullPageCachingDispatch method
  *
- * @access public
  * @return void
+ * @access public
  */
 	function testFullPageCachingDispatch() {
 		Configure::write('Cache.disable', false);
@@ -1981,8 +1983,8 @@ class DispatcherTest extends CakeTestCase {
 /**
  * testHttpMethodOverrides method
  *
- * @access public
  * @return void
+ * @access public
  */
 	function testHttpMethodOverrides() {
 		Router::reload();
@@ -2036,6 +2038,7 @@ class DispatcherTest extends CakeTestCase {
  * Tests that invalid characters cannot be injected into the application base path.
  *
  * @return void
+ * @access public
  */
 	function testBasePathInjection() {
 		$self = $_SERVER['PHP_SELF'];
@@ -2052,8 +2055,8 @@ class DispatcherTest extends CakeTestCase {
 /**
  * testEnvironmentDetection method
  *
- * @access public
  * @return void
+ * @access public
  */
 	function testEnvironmentDetection() {
 		$dispatcher =& new Dispatcher();
@@ -2158,8 +2161,8 @@ class DispatcherTest extends CakeTestCase {
 /**
  * Tests that the Dispatcher does not return an empty action
  *
- * @access private
  * @return void
+ * @access public
  */
 	function testTrailingSlash() {
 		$_POST = array();
@@ -2184,8 +2187,8 @@ class DispatcherTest extends CakeTestCase {
 /**
  * backupEnvironment method
  *
- * @access private
  * @return void
+ * @access private
  */
 	function __backupEnvironment() {
 		return array(
@@ -2199,8 +2202,8 @@ class DispatcherTest extends CakeTestCase {
 /**
  * reloadEnvironment method
  *
- * @access private
  * @return void
+ * @access private
  */
 	function __reloadEnvironment() {
 		foreach ($_GET as $key => $val) {
@@ -2219,8 +2222,8 @@ class DispatcherTest extends CakeTestCase {
  * loadEnvironment method
  *
  * @param mixed $env
- * @access private
  * @return void
+ * @access private
  */
 	function __loadEnvironment($env) {
 		if ($env['reload']) {
@@ -2254,8 +2257,8 @@ class DispatcherTest extends CakeTestCase {
  * cachePath method
  *
  * @param mixed $her
- * @access private
  * @return string
+ * @access private
  */
 	function __cachePath($here) {
 		$path = $here;
diff --git a/cake/tests/cases/libs/cake_log.test.php b/cake/tests/cases/libs/cake_log.test.php
index b77310065..2aa63ef46 100644
--- a/cake/tests/cases/libs/cake_log.test.php
+++ b/cake/tests/cases/libs/cake_log.test.php
@@ -32,7 +32,7 @@ class CakeLogTest extends CakeTestCase {
  * Start test callback, clears all streams enabled.
  *
  * @return void
- **/
+ */
 	function startTest() {
 		$streams = CakeLog::streams();
 		foreach ($streams as $stream) {
@@ -44,7 +44,7 @@ class CakeLogTest extends CakeTestCase {
  * test importing loggers from app/libs and plugins.
  *
  * @return void
- **/
+ */
 	function testImportingLoggers() {
 		App::build(array(
 			'libs' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'libs' . DS),
@@ -70,7 +70,7 @@ class CakeLogTest extends CakeTestCase {
  * test all the errors from failed logger imports
  *
  * @return void
- **/
+ */
 	function testImportingLoggerFailure() {
 		$this->expectError('Missing logger classname');
 		CakeLog::config('fail', array());
@@ -87,7 +87,7 @@ class CakeLogTest extends CakeTestCase {
  * When no streams are there.
  *
  * @return void
- **/
+ */
 	function testAutoConfig() {
 		@unlink(LOGS . 'error.log');
 		CakeLog::write(LOG_WARNING, 'Test warning');
@@ -102,7 +102,7 @@ class CakeLogTest extends CakeTestCase {
  * test configuring log streams
  *
  * @return void
- **/
+ */
 	function testConfig() {
 		CakeLog::config('file', array(
 			'engine' => 'FileLog',
@@ -145,7 +145,7 @@ class CakeLogTest extends CakeTestCase {
  * Test logging with the error handler.
  *
  * @return void
- **/
+ */
 	function testLoggingWithErrorHandling() {
 		@unlink(LOGS . 'debug.log');
 		Configure::write('log', E_ALL & ~E_DEPRECATED);
diff --git a/cake/tests/cases/libs/cake_test_case.test.php b/cake/tests/cases/libs/cake_test_case.test.php
index 725e95ae1..5260420a8 100644
--- a/cake/tests/cases/libs/cake_test_case.test.php
+++ b/cake/tests/cases/libs/cake_test_case.test.php
@@ -257,7 +257,7 @@ class CakeTestCaseTest extends CakeTestCase {
  *
  * @access public
  * @return void
- **/
+ */
 	function testTestAction() {
 		App::build(array(
 			'plugins' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS),
@@ -389,7 +389,7 @@ class CakeTestCaseTest extends CakeTestCase {
  * testSkipIf
  *
  * @return void
- **/
+ */
 	function testSkipIf() {
 		$this->assertTrue($this->Case->skipIf(true));
 		$this->assertFalse($this->Case->skipIf(false));
diff --git a/cake/tests/cases/libs/cake_test_fixture.test.php b/cake/tests/cases/libs/cake_test_fixture.test.php
index e0b6c64a0..385b07562 100644
--- a/cake/tests/cases/libs/cake_test_fixture.test.php
+++ b/cake/tests/cases/libs/cake_test_fixture.test.php
@@ -110,7 +110,7 @@ class CakeTestFixtureDefaultImportFixture extends CakeTestFixture {
  *
  * @package       default
  * @subpackage    cake.cake.tests.cases.libs.
- **/
+ */
 class FixtureImportTestModel extends Model {
 	var $name = 'FixtureImport';
 	var $useTable = 'fixture_tests';
diff --git a/cake/tests/cases/libs/code_coverage_manager.test.php b/cake/tests/cases/libs/code_coverage_manager.test.php
index abbf41d2d..f24a2c059 100644
--- a/cake/tests/cases/libs/code_coverage_manager.test.php
+++ b/cake/tests/cases/libs/code_coverage_manager.test.php
@@ -45,7 +45,7 @@ class CodeCoverageManagerTest extends CakeTestCase {
  * Store reference of $_GET to restore later.
  *
  * @return void
- **/
+ */
 	function startCase() {
 		$this->_get = $_GET;
 	}
@@ -54,7 +54,7 @@ class CodeCoverageManagerTest extends CakeTestCase {
  * End Case - restore GET vars.
  *
  * @return void
- **/
+ */
 	function endCase() {
 		$_GET = $this->_get;
 	}
diff --git a/cake/tests/cases/libs/configure.test.php b/cake/tests/cases/libs/configure.test.php
index 8b146b354..25eb9979c 100644
--- a/cake/tests/cases/libs/configure.test.php
+++ b/cake/tests/cases/libs/configure.test.php
@@ -136,7 +136,7 @@ class ConfigureTest extends CakeTestCase {
  * testSetErrorReporting Level
  *
  * @return void
- **/
+ */
 	function testSetErrorReportingLevel() {
 		Configure::write('log', false);
 
@@ -160,7 +160,7 @@ class ConfigureTest extends CakeTestCase {
  * test that log and debug configure values interact well.
  *
  * @return void
- **/
+ */
 	function testInteractionOfDebugAndLog() {
 		Configure::write('log', false);
 
diff --git a/cake/tests/cases/libs/controller/component.test.php b/cake/tests/cases/libs/controller/component.test.php
index 462321a57..f5a6745d1 100644
--- a/cake/tests/cases/libs/controller/component.test.php
+++ b/cake/tests/cases/libs/controller/component.test.php
@@ -477,7 +477,7 @@ class ComponentTest extends CakeTestCase {
  * Ensure that settings are not duplicated when passed into component initialize.
  *
  * @return void
- **/
+ */
 	function testComponentParamsNoDuplication() {
 		if ($this->skipIf(defined('APP_CONTROLLER_EXISTS'), '%s Need a non-existent AppController')) {
 			return;
diff --git a/cake/tests/cases/libs/controller/components/auth.test.php b/cake/tests/cases/libs/controller/components/auth.test.php
index 14a912329..07bf1b8f7 100644
--- a/cake/tests/cases/libs/controller/components/auth.test.php
+++ b/cake/tests/cases/libs/controller/components/auth.test.php
@@ -767,7 +767,7 @@ class AuthTest extends CakeTestCase {
  * test authorize = 'actions' setting.
  *
  * @return void
- **/
+ */
 	function testAuthorizeActions() {
 		$this->AuthUser =& new AuthUser();
 		$user = $this->AuthUser->find();
@@ -827,7 +827,7 @@ class AuthTest extends CakeTestCase {
  * test the action() method
  *
  * @return void
- **/
+ */
 	function testActionMethod() {
 		$this->Controller->params['controller'] = 'auth_test';
 		$this->Controller->params['action'] = 'add';
@@ -856,7 +856,7 @@ class AuthTest extends CakeTestCase {
  * test that deny() converts camel case inputs to lowercase.
  *
  * @return void
- **/
+ */
 	function testDenyWithCamelCaseMethods() {
 		$this->Controller->Auth->initialize($this->Controller);
 		$this->Controller->Auth->allow('*');
@@ -873,7 +873,7 @@ class AuthTest extends CakeTestCase {
  * test that allow() and allowedActions work with camelCase method names.
  *
  * @return void
- **/
+ */
 	function testAllowedActionsWithCamelCaseMethods() {
 		$url = '/auth_test/camelCase';
 		$this->Controller->params = Router::parse($url);
@@ -1099,7 +1099,7 @@ class AuthTest extends CakeTestCase {
  * And the user doesn't have a session.
  *
  * @return void
- **/
+ */
 	function testNoRedirectOn404() {
 		$this->Controller->Session->delete('Auth');
 		$this->Controller->Auth->initialize($this->Controller);
@@ -1201,7 +1201,7 @@ class AuthTest extends CakeTestCase {
  * test Hashing of passwords
  *
  * @return void
- **/
+ */
 	function testHashPasswords() {
 		$this->Controller->Auth->userModel = 'AuthUser';
 
diff --git a/cake/tests/cases/libs/controller/components/request_handler.test.php b/cake/tests/cases/libs/controller/components/request_handler.test.php
index a72e602be..ca757321f 100644
--- a/cake/tests/cases/libs/controller/components/request_handler.test.php
+++ b/cake/tests/cases/libs/controller/components/request_handler.test.php
@@ -37,7 +37,7 @@ class RequestHandlerTestController extends Controller {
  *
  * @var string
  * @access public
- **/
+ */
 	var $name = 'RequestHandlerTest';
 
 /**
@@ -66,7 +66,7 @@ class RequestHandlerTestController extends Controller {
  * test method for ajax redirection
  *
  * @return void
- **/
+ */
 	function destination() {
 		$this->viewPath = 'posts';
 		$this->render('index');
@@ -245,7 +245,7 @@ class RequestHandlerComponentTest extends CakeTestCase {
  * testStartupCallback with charset.
  *
  * @return void
- **/
+ */
 	function testStartupCallbackCharset() {
 		$_SERVER['REQUEST_METHOD'] = 'PUT';
 		$_SERVER['CONTENT_TYPE'] = 'application/xml; charset=UTF-8';
@@ -287,7 +287,7 @@ class RequestHandlerComponentTest extends CakeTestCase {
  *
  * @link #6466
  * @return void
- **/
+ */
 	function testRenderAsCalledTwice() {
 		$this->RequestHandler->renderAs($this->Controller, 'xml');
 		$this->assertEqual($this->Controller->viewPath, 'request_handler_test' . DS . 'xml');
@@ -551,7 +551,7 @@ class RequestHandlerComponentTest extends CakeTestCase {
  * test that ajax requests involving redirects trigger requestAction instead.
  *
  * @return void
- **/
+ */
 	function testAjaxRedirectAsRequestAction() {
 		$_SERVER['HTTP_X_REQUESTED_WITH'] = 'XMLHttpRequest';
 		$this->_init();
diff --git a/cake/tests/cases/libs/controller/components/security.test.php b/cake/tests/cases/libs/controller/components/security.test.php
index 28eb2eab5..a704dd183 100644
--- a/cake/tests/cases/libs/controller/components/security.test.php
+++ b/cake/tests/cases/libs/controller/components/security.test.php
@@ -564,7 +564,7 @@ DIGEST;
  * test that validatePost fails if any of its required fields are missing.
  *
  * @return void
- **/
+ */
 	function testValidatePostFormHacking() {
 		$this->Controller->Security->startup($this->Controller);
 		$key = $this->Controller->params['_Token']['key'];
@@ -676,7 +676,7 @@ DIGEST;
  * test ValidatePost with multiple select elements.
  *
  * @return void
- **/
+ */
 	function testValidatePostMultipleSelect() {
 		$this->Controller->Security->startup($this->Controller);
 		$key = $this->Controller->params['_Token']['key'];
diff --git a/cake/tests/cases/libs/controller/controller.test.php b/cake/tests/cases/libs/controller/controller.test.php
index be3ca1738..fe35ba865 100644
--- a/cake/tests/cases/libs/controller/controller.test.php
+++ b/cake/tests/cases/libs/controller/controller.test.php
@@ -252,7 +252,7 @@ class ControllerPaginateModel extends CakeTestModel {
  *
  * @return void
  * @access public
- **/
+ */
 	function paginate($conditions, $fields, $order, $limit, $page, $recursive, $extra) {
 		$this->extra = $extra;
 	}
@@ -673,7 +673,7 @@ class ControllerTest extends CakeTestCase {
  * Test that special paginate types are called and that the type param doesn't leak out into defaults or options.
  *
  * @return void
- **/
+ */
 	function testPaginateSpecialType() {
 		$Controller =& new Controller();
 		$Controller->uses = array('ControllerPost', 'ControllerComment');
@@ -1029,7 +1029,7 @@ class ControllerTest extends CakeTestCase {
  *
  * @access public
  * @return void
- **/
+ */
 	function testChildComponentOptionsSupercedeParents() {
 		if ($this->skipIf(defined('APP_CONTROLLER_EXISTS'), '%s Need a non-existent AppController')) {
 			return;
@@ -1046,7 +1046,7 @@ class ControllerTest extends CakeTestCase {
  * AppController when you make an instance of Controller
  *
  * @return void
- **/
+ */
 	function testMergeVarsNotGreedy() {
 		$Controller =& new Controller();
 		$Controller->components = array();
diff --git a/cake/tests/cases/libs/controller/controller_merge_vars.test.php b/cake/tests/cases/libs/controller/controller_merge_vars.test.php
index 4b86318f0..9009f00f6 100644
--- a/cake/tests/cases/libs/controller/controller_merge_vars.test.php
+++ b/cake/tests/cases/libs/controller/controller_merge_vars.test.php
@@ -20,23 +20,26 @@
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
 if (!class_exists('AppController')) {
-	/**
-	 * Test case AppController requred
-	 *
-	 * @package cake.tests.cases.libs.controller
-	 **/
+
+/**
+ * Test case AppController
+ *
+ * @package cake
+ * @subpackage cake.tests.cases.libs.controller
+ */
 	class AppController extends Controller {
-		/**
-		 * components
-		 *
-		 * @var array
-		 **/
+
+/**
+ * components
+ *
+ * @var array
+ */
 		var $components = array('MergeVar' => array('flag', 'otherFlag', 'redirect' => false));
-		/**
-		 * helpers
-		 *
-		 * @var array
-		 **/
+/**
+ * helpers
+ *
+ * @var array
+ */
 		var $helpers = array('MergeVar' => array('format' => 'html', 'terse'));
 	}
 } elseif (!defined('APP_CONTROLLER_EXISTS')) {
@@ -47,7 +50,7 @@ if (!class_exists('AppController')) {
  * MergeVar Component
  *
  * @package cake.tests.cases.libs.controller
- **/
+ */
 class MergeVarComponent extends Object {
 
 }
@@ -56,21 +59,21 @@ class MergeVarComponent extends Object {
  * Additional controller for testing
  *
  * @package cake.tests.cases.libs.controller
- **/
+ */
 class MergeVariablesController extends AppController {
 
 /**
  * name
  *
  * @var string
- **/
+ */
 	var $name = 'MergeVariables';
 
 /**
  * uses
  *
  * @var arrays
- **/
+ */
 	var $uses = array();
 }
 
@@ -78,21 +81,21 @@ class MergeVariablesController extends AppController {
  * MergeVarPlugin App Controller
  *
  * @package cake.tests.cases.libs.controller
- **/
+ */
 class MergeVarPluginAppController extends AppController {
 
 /**
  * components
  *
  * @var array
- **/
+ */
 	var $components = array('Auth' => array('setting' => 'val', 'otherVal'));
 
 /**
  * helpers
  *
  * @var array
- **/
+ */
 	var $helpers = array('Javascript');
 }
 
@@ -100,21 +103,21 @@ class MergeVarPluginAppController extends AppController {
  * MergePostsController
  *
  * @package cake.tests.cases.libs.controller
- **/
+ */
 class MergePostsController extends MergeVarPluginAppController {
 
 /**
  * name
  *
  * @var string
- **/
+ */
 	var $name = 'MergePosts';
 
 /**
  * uses
  *
  * @var array
- **/
+ */
 	var $uses = array();
 }
 
@@ -123,13 +126,13 @@ class MergePostsController extends MergeVarPluginAppController {
  * Test Case for Controller Merging of Vars.
  *
  * @package cake.tests.cases.libs.controller
- **/
+ */
 class ControllerMergeVarsTestCase extends CakeTestCase {
 /**
  * Skips the case if APP_CONTROLLER_EXISTS is defined
  *
  * @return void
- **/
+ */
 	function skip() {
 		$this->skipIf(defined('APP_CONTROLLER_EXISTS'), 'APP_CONTROLLER_EXISTS cannot run. %s');
 	}
@@ -137,7 +140,7 @@ class ControllerMergeVarsTestCase extends CakeTestCase {
  * end test
  *
  * @return void
- **/
+ */
 	function endTest() {
 		ClassRegistry::flush();
 	}
@@ -146,7 +149,7 @@ class ControllerMergeVarsTestCase extends CakeTestCase {
  * test that component settings are not duplicated when merging component settings
  *
  * @return void
- **/
+ */
 	function testComponentParamMergingNoDuplication() {
 		$Controller =& new MergeVariablesController();
 		$Controller->constructClasses();
@@ -159,7 +162,7 @@ class ControllerMergeVarsTestCase extends CakeTestCase {
  * test component merges with redeclared components
  *
  * @return void
- **/
+ */
 	function testComponentMergingWithRedeclarations() {
 		$Controller =& new MergeVariablesController();
 		$Controller->components['MergeVar'] = array('remote', 'redirect' => true);
@@ -173,7 +176,7 @@ class ControllerMergeVarsTestCase extends CakeTestCase {
  * test merging of helpers array, ensure no duplication occurs
  *
  * @return void
- **/
+ */
 	function testHelperSettingMergingNoDuplication() {
 		$Controller =& new MergeVariablesController();
 		$Controller->constructClasses();
@@ -186,7 +189,7 @@ class ControllerMergeVarsTestCase extends CakeTestCase {
  * test merging of vars with plugin
  *
  * @return void
- **/
+ */
 	function testMergeVarsWithPlugin() {
 		$Controller =& new MergePostsController();
 		$Controller->components = array('Email' => array('ports' => 'open'));
@@ -223,7 +226,7 @@ class ControllerMergeVarsTestCase extends CakeTestCase {
  * AppController when you make an instance of Controller
  *
  * @return void
- **/
+ */
 	function testMergeVarsNotGreedy() {
 		$Controller =& new Controller();
 		$Controller->components = array();
diff --git a/cake/tests/cases/libs/controller/scaffold.test.php b/cake/tests/cases/libs/controller/scaffold.test.php
index 31cd29654..0813be0c2 100644
--- a/cake/tests/cases/libs/controller/scaffold.test.php
+++ b/cake/tests/cases/libs/controller/scaffold.test.php
@@ -153,7 +153,7 @@ class ScaffoldMock extends CakeTestModel {
  * hasAndBelongsToMany property
  *
  * @var string
- **/
+ */
 	var $hasAndBelongsToMany = array(
 		'ScaffoldTag' => array(
 			'className' => 'ScaffoldTag',
@@ -387,7 +387,7 @@ class ScaffoldViewTest extends CakeTestCase {
  *
  * @access public
  * @return void
- **/
+ */
 	function testIndexScaffold() {
 		$this->Controller->action = 'index';
 		$this->Controller->here = '/scaffold_mock';
@@ -426,7 +426,7 @@ class ScaffoldViewTest extends CakeTestCase {
  *
  * @access public
  * @return void
- **/
+ */
 	function testViewScaffold() {
 		$this->Controller->action = 'view';
 		$this->Controller->here = '/scaffold_mock';
@@ -468,7 +468,7 @@ class ScaffoldViewTest extends CakeTestCase {
  *
  * @access public
  * @return void
- **/
+ */
 	function testEditScaffold() {
 		$this->Controller->action = 'edit';
 		$this->Controller->here = '/scaffold_mock';
@@ -509,7 +509,7 @@ class ScaffoldViewTest extends CakeTestCase {
  *
  * @access public
  * @return void
- **/
+ */
 	function testAdminIndexScaffold() {
 		$_backAdmin = Configure::read('Routing.prefixes');
 
@@ -554,7 +554,7 @@ class ScaffoldViewTest extends CakeTestCase {
  *
  * @access public
  * @return void
- **/
+ */
 	function testAdminEditScaffold() {
 		$_backAdmin = Configure::read('Routing.prefixes');
 
@@ -597,7 +597,7 @@ class ScaffoldViewTest extends CakeTestCase {
  *
  * @access public
  * @return void
- **/
+ */
 	function testMultiplePrefixScaffold() {
 		$_backAdmin = Configure::read('Routing.prefixes');
 
@@ -718,7 +718,7 @@ class ScaffoldTest extends CakeTestCase {
  * test that the proper names and variable values are set by Scaffold
  *
  * @return void
- **/
+ */
 	function testScaffoldVariableSetting() {
 		$this->Controller->action = 'admin_edit';
 		$this->Controller->here = '/admin/scaffold_mock/edit';
@@ -757,7 +757,7 @@ class ScaffoldTest extends CakeTestCase {
  * test that scaffold outputs flash messages when sessions are unset.
  *
  * @return void
- **/
+ */
 	function testScaffoldFlashMessages() {
 		$this->Controller->action = 'edit';
 		$this->Controller->here = '/scaffold_mock';
@@ -797,7 +797,7 @@ class ScaffoldTest extends CakeTestCase {
  *
  * @see http://code.cakephp.org/tickets/view/48
  * @return void
- **/
+ */
 	function testHabtmFieldAdditionWithScaffoldForm() {
 		$this->Controller->action = 'edit';
 		$this->Controller->here = '/scaffold_mock';
@@ -830,7 +830,7 @@ class ScaffoldTest extends CakeTestCase {
  * test that the proper names and variable values are set by Scaffold
  *
  * @return void
- **/
+ */
 	function testEditScaffoldWithScaffoldFields() {
 		$this->Controller = new ScaffoldMockControllerWithFields();
 		$this->Controller->action = 'edit';
diff --git a/cake/tests/cases/libs/error.test.php b/cake/tests/cases/libs/error.test.php
index 262805eca..ac53aa6a2 100644
--- a/cake/tests/cases/libs/error.test.php
+++ b/cake/tests/cases/libs/error.test.php
@@ -218,7 +218,7 @@ class MyCustomErrorHandler extends ErrorHandler {
  * custom error message type.
  *
  * @return void
- **/
+ */
 	function missingWidgetThing() {
 		echo 'widget thing is missing';
 	}
@@ -276,7 +276,7 @@ class ErrorHandlerTest extends CakeTestCase {
  * into error404 when debug == 0
  *
  * @return void
- **/
+ */
 	function testSubclassMethodsNotBeingConvertedToError() {
 		$back = Configure::read('debug');
 		Configure::write('debug', 2);
diff --git a/cake/tests/cases/libs/folder.test.php b/cake/tests/cases/libs/folder.test.php
index c72f5fecc..84a24601b 100644
--- a/cake/tests/cases/libs/folder.test.php
+++ b/cake/tests/cases/libs/folder.test.php
@@ -222,7 +222,7 @@ class FolderTest extends CakeTestCase {
  * test Adding path elements to a path
  *
  * @return void
- **/
+ */
 	function testAddPathElement() {
 		$result = Folder::addPathElement(DS . 'some' . DS . 'dir', 'another_path');
 		$this->assertEqual($result, DS . 'some' . DS . 'dir' . DS . 'another_path');
diff --git a/cake/tests/cases/libs/log/file_log.test.php b/cake/tests/cases/libs/log/file_log.test.php
index 68e29591b..a479bc302 100644
--- a/cake/tests/cases/libs/log/file_log.test.php
+++ b/cake/tests/cases/libs/log/file_log.test.php
@@ -67,7 +67,7 @@ class FileLogTest extends CakeTestCase {
  * test using the path setting to write logs in other places.
  *
  * @return void
- **/
+ */
 	function testPathSetting() {
 		$path = TMP . 'tests' . DS;
 		@unlink($path . 'error.log');
diff --git a/cake/tests/cases/libs/magic_db.test.php b/cake/tests/cases/libs/magic_db.test.php
index d976a0758..7b57d245a 100644
--- a/cake/tests/cases/libs/magic_db.test.php
+++ b/cake/tests/cases/libs/magic_db.test.php
@@ -172,7 +172,7 @@ class MagicDbTestData extends Object {
  *
  * @param string $key
  * @access public
- **/
+ */
 	function get($key) {
 /**
  * data property
diff --git a/cake/tests/cases/libs/model/cake_schema.test.php b/cake/tests/cases/libs/model/cake_schema.test.php
index 7b00d7b39..52ffbfb38 100644
--- a/cake/tests/cases/libs/model/cake_schema.test.php
+++ b/cake/tests/cases/libs/model/cake_schema.test.php
@@ -463,7 +463,7 @@ class CakeSchemaTest extends CakeTestCase {
  * test reading schema from plugins.
  *
  * @return void
- **/
+ */
 	function testSchemaReadWithPlugins() {
 		App::objects('model', null, false);
 		App::build(array(
@@ -489,7 +489,7 @@ class CakeSchemaTest extends CakeTestCase {
  * test that tables are generated correctly
  *
  * @return void
- **/
+ */
 	function testGenerateTable() {
 		$fields = array(
 			'id' => array('type' => 'integer', 'null' => false, 'default' => 0, 'key' => 'primary'),
@@ -567,7 +567,7 @@ class CakeSchemaTest extends CakeTestCase {
  * Test comparing tableParameters and indexes.
  *
  * @return void
- **/
+ */
 	function testTableParametersAndIndexComparison() {
 		$old = array(
 			'posts' => array(
@@ -670,7 +670,7 @@ class CakeSchemaTest extends CakeTestCase {
  * test loading schema files inside of plugins.
  *
  * @return void
- **/
+ */
 	function testSchemaLoadingFromPlugin() {
 		App::build(array(
 			'plugins' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
diff --git a/cake/tests/cases/libs/model/datasources/dbo/dbo_adodb.test.php b/cake/tests/cases/libs/model/datasources/dbo/dbo_adodb.test.php
index 764960b7e..549bf8e66 100644
--- a/cake/tests/cases/libs/model/datasources/dbo/dbo_adodb.test.php
+++ b/cake/tests/cases/libs/model/datasources/dbo/dbo_adodb.test.php
@@ -196,7 +196,7 @@ class DboAdodbTest extends CakeTestCase {
  *
  * @var string
  * @access public
- **/
+ */
 	var $fixtures = array('core.article');
 
 /**
diff --git a/cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php b/cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php
index 34ef2e682..be57aab6c 100644
--- a/cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php
+++ b/cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php
@@ -203,7 +203,7 @@ class DboMysqlTest extends CakeTestCase {
  * startCase
  *
  * @return void
- **/
+ */
 	function startCase() {
 		$this->_debug = Configure::read('debug');
 		Configure::write('debug', 1);
@@ -213,7 +213,7 @@ class DboMysqlTest extends CakeTestCase {
  * endCase
  *
  * @return void
- **/
+ */
 	function endCase() {
 		Configure::write('debug', $this->_debug);
 	}
@@ -418,7 +418,7 @@ class DboMysqlTest extends CakeTestCase {
  * Using a mock ensure that MySQL 4.x output is properly parsed.
  *
  * @return void
- **/
+ */
 	function testIndexOnMySQL4Output() {
 		$name = $this->db->fullTableName('simple');
 
@@ -631,7 +631,7 @@ class DboMysqlTest extends CakeTestCase {
  * test saving and retrieval of blobs
  *
  * @return void
- **/
+ */
 	function testBlobSaving() {
 		$this->db->cacheSources = false;
 		$data = "GIF87ab
@@ -650,7 +650,7 @@ class DboMysqlTest extends CakeTestCase {
  * test altering the table settings with schema.
  *
  * @return void
- **/
+ */
 	function testAlteringTableParameters() {
 		App::import('Model', 'CakeSchema');
 		$this->db->cacheSources = $this->db->testing = false;
diff --git a/cake/tests/cases/libs/model/datasources/dbo/dbo_mysqli.test.php b/cake/tests/cases/libs/model/datasources/dbo/dbo_mysqli.test.php
index 9dc6e141e..d54d6c8de 100644
--- a/cake/tests/cases/libs/model/datasources/dbo/dbo_mysqli.test.php
+++ b/cake/tests/cases/libs/model/datasources/dbo/dbo_mysqli.test.php
@@ -303,7 +303,7 @@ class DboMysqliTest extends CakeTestCase {
  * test that float values are correctly identified
  *
  * @return void
- **/
+ */
 	function testFloatParsing() {
 		$model =& new Model(array('ds' => 'test_suite', 'table' => 'datatypes', 'name' => 'Datatype'));
 		$result = $this->db->describe($model);
diff --git a/cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php b/cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php
index b5376163d..17704618f 100644
--- a/cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php
+++ b/cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php
@@ -312,7 +312,7 @@ class DboPostgresTest extends CakeTestCase {
  * test that date and time columns do not generate errors with null and nullish values.
  *
  * @return void
- **/
+ */
 	function testDateAndTimeAsNull() {
 		$this->assertEqual($this->db2->value(null, 'date'), 'NULL');
 		$this->assertEqual($this->db2->value('', 'date'), 'NULL');
@@ -523,7 +523,7 @@ class DboPostgresTest extends CakeTestCase {
  * Test index generation from table info.
  *
  * @return void
- **/
+ */
 	function testIndexGeneration() {
 		$name = $this->db->fullTableName('index_test', false);
 		$this->db->query('CREATE TABLE ' . $name . ' ("id" serial NOT NULL PRIMARY KEY, "bool" integer, "small_char" varchar(50), "description" varchar(40) )');
diff --git a/cake/tests/cases/libs/model/datasources/dbo/dbo_sqlite.test.php b/cake/tests/cases/libs/model/datasources/dbo/dbo_sqlite.test.php
index 5614b6a28..1153f0812 100644
--- a/cake/tests/cases/libs/model/datasources/dbo/dbo_sqlite.test.php
+++ b/cake/tests/cases/libs/model/datasources/dbo/dbo_sqlite.test.php
@@ -220,7 +220,7 @@ class DboSqliteTest extends CakeTestCase {
  * test building columns with SQLite
  *
  * @return void
- **/
+ */
 	function testBuildColumn() {
 		$data = array(
 			'name' => 'int_field',
@@ -292,7 +292,7 @@ class DboSqliteTest extends CakeTestCase {
  * test describe() and normal results.
  *
  * @return void
- **/
+ */
 	function testDescribe() {
 		$Model =& new Model(array('name' => 'User', 'ds' => 'test_suite', 'table' => 'users'));
 		$result = $this->db->describe($Model);
@@ -336,7 +336,7 @@ class DboSqliteTest extends CakeTestCase {
  * test that describe does not corrupt UUID primary keys
  *
  * @return void
- **/
+ */
 	function testDescribeWithUuidPrimaryKey() {
 		$tableName = 'uuid_tests';
 		$this->db->query("CREATE TABLE {$tableName} (id VARCHAR(36) PRIMARY KEY, name VARCHAR, created DATETIME, modified DATETIME)");
diff --git a/cake/tests/cases/libs/model/datasources/dbo_source.test.php b/cake/tests/cases/libs/model/datasources/dbo_source.test.php
index 7696f929d..cb74f5687 100644
--- a/cake/tests/cases/libs/model/datasources/dbo_source.test.php
+++ b/cake/tests/cases/libs/model/datasources/dbo_source.test.php
@@ -3643,7 +3643,7 @@ class DboSourceTest extends CakeTestCase {
  * test hasAny()
  *
  * @return void
- **/
+ */
 	function testHasAny() {
 		$this->testDb->hasAny($this->Model, array());
 		$expected = 'SELECT COUNT(`TestModel`.`id`) AS count FROM `test_models` AS `TestModel` WHERE 1 = 1';
@@ -4000,7 +4000,7 @@ class DboSourceTest extends CakeTestCase {
  * test getting the query log as an array.
  *
  * @return void
- **/
+ */
 	function testGetLog() {
 		$this->testDb->logQuery('Query 1');
 		$this->testDb->logQuery('Query 2');
@@ -4024,7 +4024,7 @@ class DboSourceTest extends CakeTestCase {
  * test that execute runs queries.
  *
  * @return void
- **/
+ */
 	function testExecute() {
 		$query = 'SELECT * FROM ' . $this->testDb->fullTableName('articles') . ' WHERE 1 = 1';
 
@@ -4046,7 +4046,7 @@ class DboSourceTest extends CakeTestCase {
  * test that query() returns boolean values from operations like CREATE TABLE
  *
  * @return void
- **/
+ */
 	function testFetchAllBooleanReturns() {
 		$name = $this->db->fullTableName('test_query');
 		$query = "CREATE TABLE {$name} (name varchar(10));";
@@ -4062,7 +4062,7 @@ class DboSourceTest extends CakeTestCase {
  * test ShowQuery generation of regular and error messages
  *
  * @return void
- **/
+ */
 	function testShowQuery() {
 		$this->testDb->error = false;
 		ob_start();
diff --git a/cake/tests/cases/libs/model/model_behavior.test.php b/cake/tests/cases/libs/model/model_behavior.test.php
index 22d586082..3a9bc7cae 100644
--- a/cake/tests/cases/libs/model/model_behavior.test.php
+++ b/cake/tests/cases/libs/model/model_behavior.test.php
@@ -508,7 +508,7 @@ class BehaviorTest extends CakeTestCase {
  * test that attaching a non existant Behavior triggers a cake error.
  *
  * @return void
- **/
+ */
 	function testInvalidBehaviorCausingCakeError() {
 		$Apple =& new Apple();
 		$Apple->Behaviors =& new MockModelBehaviorCollection();
@@ -1103,7 +1103,7 @@ class BehaviorTest extends CakeTestCase {
  *
  * @access public
  * @return void
- **/
+ */
 	function testBehaviorAttachAndDetach() {
 		$Sample =& new Sample();
 		$Sample->actsAs = array('Test3' => array('bar'), 'Test2' => array('foo', 'bar'));
diff --git a/cake/tests/cases/libs/model/model_delete.test.php b/cake/tests/cases/libs/model/model_delete.test.php
index 7a66eb7c2..6702d1752 100644
--- a/cake/tests/cases/libs/model/model_delete.test.php
+++ b/cake/tests/cases/libs/model/model_delete.test.php
@@ -572,7 +572,7 @@ class ModelDeleteTest extends BaseModelTest {
  * test that beforeDelete returning false can abort deletion.
  *
  * @return void
- **/
+ */
 	function testBeforeDeleteDeleteAbortion() {
 		$this->loadFixtures('Post');
 		$Model =& new CallbackPostTestModel();
diff --git a/cake/tests/cases/libs/model/model_integration.test.php b/cake/tests/cases/libs/model/model_integration.test.php
index 4658e6cdc..33d9e9ea6 100644
--- a/cake/tests/cases/libs/model/model_integration.test.php
+++ b/cake/tests/cases/libs/model/model_integration.test.php
@@ -536,7 +536,7 @@ class ModelIntegrationTest extends BaseModelTest {
  * test deconstruct() with time fields.
  *
  * @return void
- **/
+ */
 	function testDeconstructFieldsTime() {
 		$this->loadFixtures('Apple');
 		$TestModel =& new Apple();
@@ -881,7 +881,7 @@ class ModelIntegrationTest extends BaseModelTest {
  * ensure that __exists is reset on create
  *
  * @return void
- **/
+ */
 	function testResetOfExistsOnCreate() {
 		$this->loadFixtures('Article');
 		$Article =& new Article();
@@ -1179,7 +1179,7 @@ class ModelIntegrationTest extends BaseModelTest {
  * ensure that $actsAS and $_findMethods are merged.
  *
  * @return void
- **/
+ */
 	function testConstruct() {
 		$this->loadFixtures('Post', 'Comment');
 
@@ -1200,7 +1200,7 @@ class ModelIntegrationTest extends BaseModelTest {
  * ensure that $actsAS and $_findMethods are merged.
  *
  * @return void
- **/
+ */
 	function testConstructWithAlternateDataSource() {
 		$TestModel =& ClassRegistry::init(array(
 			'class' => 'DoesntMatter', 'ds' => 'test_suite', 'table' => false
diff --git a/cake/tests/cases/libs/model/model_read.test.php b/cake/tests/cases/libs/model/model_read.test.php
index 420d65393..dd314ca48 100644
--- a/cake/tests/cases/libs/model/model_read.test.php
+++ b/cake/tests/cases/libs/model/model_read.test.php
@@ -4734,7 +4734,7 @@ class ModelReadTest extends BaseModelTest {
  * test that bindModel behaves with Custom primary Key associations
  *
  * @return void
- **/
+ */
 	function bindWithCustomPrimaryKey() {
 		$this->loadFixtures('Story', 'StoriesTag', 'Tag');
 		$Model =& ClassRegistry::init('StoriesTag');
@@ -6400,7 +6400,7 @@ class ModelReadTest extends BaseModelTest {
  * test find with COUNT(DISTINCT field)
  *
  * @return void
- **/
+ */
 	function testFindCountDistinct() {
 		$skip = $this->skipIf(
 			$this->db->config['driver'] == 'sqlite',
diff --git a/cake/tests/cases/libs/model/model_validation.test.php b/cake/tests/cases/libs/model/model_validation.test.php
index c60aec899..a9a46b9d0 100644
--- a/cake/tests/cases/libs/model/model_validation.test.php
+++ b/cake/tests/cases/libs/model/model_validation.test.php
@@ -126,7 +126,7 @@ class ModelValidationTest extends BaseModelTest {
  * Helps to make developement easier.
  *
  * @return void
- **/
+ */
 	function testMissingValidationErrorTriggering() {
 		$restore = Configure::read('debug');
 		Configure::write('debug', 2);
diff --git a/cake/tests/cases/libs/model/model_write.test.php b/cake/tests/cases/libs/model/model_write.test.php
index 2abb35267..d96d33b9b 100644
--- a/cake/tests/cases/libs/model/model_write.test.php
+++ b/cake/tests/cases/libs/model/model_write.test.php
@@ -313,7 +313,7 @@ class ModelWriteTest extends BaseModelTest {
  * as url for controller could be either overallFavorites/index or overall_favorites/index
  *
  * @return void
- **/
+ */
 	function testCacheClearOnSave() {
 		$_back = array(
 			'check' => Configure::read('Cache.check'),
@@ -620,7 +620,7 @@ class ModelWriteTest extends BaseModelTest {
  * test that beforeValidate returning false can abort saves.
  *
  * @return void
- **/
+ */
 	function testBeforeValidateSaveAbortion() {
 		$Model =& new CallbackPostTestModel();
 		$Model->beforeValidateReturn = false;
@@ -637,7 +637,7 @@ class ModelWriteTest extends BaseModelTest {
  * test that beforeSave returning false can abort saves.
  *
  * @return void
- **/
+ */
 	function testBeforeSaveSaveAbortion() {
 		$Model =& new CallbackPostTestModel();
 		$Model->beforeSaveReturn = false;
@@ -2622,7 +2622,7 @@ class ModelWriteTest extends BaseModelTest {
  * test HABTM saving when join table has no primary key and only 2 columns.
  *
  * @return void
- **/
+ */
 	function testHabtmSavingWithNoPrimaryKeyUuidJoinTable() {
 		$this->loadFixtures('UuidTag', 'Fruit', 'FruitsUuidTag');
 		$Fruit =& new Fruit();
@@ -2646,7 +2646,7 @@ class ModelWriteTest extends BaseModelTest {
  * test HABTM saving when join table has no primary key and only 2 columns, no with model is used.
  *
  * @return void
- **/
+ */
 	function testHabtmSavingWithNoPrimaryKeyUuidJoinTableNoWith() {
 		$this->loadFixtures('UuidTag', 'Fruit', 'FruitsUuidTag');
 		$Fruit =& new FruitNoWith();
diff --git a/cake/tests/cases/libs/model/models.php b/cake/tests/cases/libs/model/models.php
index f043706c5..8cadcb001 100644
--- a/cake/tests/cases/libs/model/models.php
+++ b/cake/tests/cases/libs/model/models.php
@@ -542,7 +542,7 @@ class ModifiedComment extends CakeTestModel {
  * afterFind callback
  *
  * @return void
- **/
+ */
 	function afterFind($results) {
 		if (isset($results[0])) {
 			$results[0]['Comment']['callback'] = 'Fire';
@@ -587,7 +587,7 @@ class AgainModifiedComment extends CakeTestModel {
  * afterFind callback
  *
  * @return void
- **/
+ */
 	function afterFind($results) {
 		if (isset($results[0])) {
 			$results[0]['Comment']['querytype'] = $this->findQueryType;
@@ -2057,7 +2057,7 @@ class CallbackPostTestModel extends CakeTestModel {
  * beforeSave callback
  *
  * @return void
- **/
+ */
 	function beforeSave($options) {
 		return $this->beforeSaveReturn;
 	}
@@ -2065,7 +2065,7 @@ class CallbackPostTestModel extends CakeTestModel {
  * beforeValidate callback
  *
  * @return void
- **/
+ */
 	function beforeValidate($options) {
 		return $this->beforeValidateReturn;
 	}
@@ -2073,7 +2073,7 @@ class CallbackPostTestModel extends CakeTestModel {
  * beforeDelete callback
  *
  * @return void
- **/
+ */
 	function beforeDelete($cascade = true) {
 		return $this->beforeDeleteReturn;
 	}
diff --git a/cake/tests/cases/libs/object.test.php b/cake/tests/cases/libs/object.test.php
index 35c1ffca3..1fc0c8335 100644
--- a/cake/tests/cases/libs/object.test.php
+++ b/cake/tests/cases/libs/object.test.php
@@ -109,7 +109,7 @@ class RequestActionController extends Controller {
  * post pass, testing post passing
  *
  * @return array
- **/
+ */
 	function post_pass() {
 		return $this->data;
 	}
@@ -152,7 +152,7 @@ class RequestActionPersistentController extends Controller {
  * post pass, testing post passing
  *
  * @return array
- **/
+ */
 	function index() {
 		return 'This is a test';
 	}
@@ -295,7 +295,7 @@ class TestObject extends Object {
  * testPersist
  *
  * @return void
- **/
+ */
 	function testPersist($name, $return = null, &$object, $type = null) {
 		return $this->_persist($name, $return, $object, $type);
 	}
@@ -324,7 +324,7 @@ class ObjectTest extends CakeTestCase {
  * fixtures
  *
  * @var string
- **/
+ */
 	var $fixtures = array('core.post', 'core.comment');
 
 /**
@@ -774,7 +774,7 @@ class ObjectTest extends CakeTestCase {
  * testCakeError
  *
  * @return void
- **/
+ */
 	function testCakeError() {
 
 	}
diff --git a/cake/tests/cases/libs/router.test.php b/cake/tests/cases/libs/router.test.php
index c1f409f09..40a8527f6 100644
--- a/cake/tests/cases/libs/router.test.php
+++ b/cake/tests/cases/libs/router.test.php
@@ -50,7 +50,7 @@ class RouterTest extends CakeTestCase {
  * end the test and reset the environment
  *
  * @return void
- **/
+ */
 	function endTest() {
 		Configure::write('Routing', $this->_routing);
 	}
@@ -1031,7 +1031,7 @@ class RouterTest extends CakeTestCase {
  * or reset
  *
  * @return void
- **/
+ */
 	function testRoutingPrefixesSetting() {
 		$restore = Configure::read('Routing');
 
@@ -1120,7 +1120,7 @@ class RouterTest extends CakeTestCase {
  * Test prefix routing and plugin combinations
  *
  * @return void
- **/
+ */
 	function testPrefixRoutingAndPlugins() {
 		Configure::write('Routing.prefixes', array('admin'));
 		$paths = App::path('plugins');
@@ -1461,7 +1461,7 @@ class RouterTest extends CakeTestCase {
  * test newer style automatically generated prefix routes.
  *
  * @return void
- **/
+ */
 	function testUrlGenerationWithAutoPrefixes() {
 		Configure::write('Routing.prefixes', array('protected'));
 		Router::reload();
@@ -1518,7 +1518,7 @@ class RouterTest extends CakeTestCase {
  * test that auto-generated prefix routes persist
  *
  * @return void
- **/
+ */
 	function testAutoPrefixRoutePersistence() {
 		Configure::write('Routing.prefixes', array('protected'));
 		Router::reload();
diff --git a/cake/tests/cases/libs/string.test.php b/cake/tests/cases/libs/string.test.php
index 0d6a39ed1..be3172684 100644
--- a/cake/tests/cases/libs/string.test.php
+++ b/cake/tests/cases/libs/string.test.php
@@ -208,7 +208,7 @@ class StringTest extends CakeTestCase {
  * test Clean Insert
  *
  * @return void
- **/
+ */
 	function testCleanInsert() {
 		$result = String::cleanInsert(':incomplete', array(
 			'clean' => true, 'before' => ':', 'after' => ''
diff --git a/cake/tests/cases/libs/validation.test.php b/cake/tests/cases/libs/validation.test.php
index 768c78991..83d154731 100644
--- a/cake/tests/cases/libs/validation.test.php
+++ b/cake/tests/cases/libs/validation.test.php
@@ -1861,7 +1861,7 @@ class ValidationTest extends CakeTestCase {
  *
  * @access public
  * @return void
- **/
+ */
 	function testMultiple() {
 		$this->assertTrue(Validation::multiple(array(0, 1, 2, 3)));
 		$this->assertTrue(Validation::multiple(array(50, 32, 22, 0)));
diff --git a/cake/tests/cases/libs/view/helper.test.php b/cake/tests/cases/libs/view/helper.test.php
index 59b46bf8a..fbdabe951 100644
--- a/cake/tests/cases/libs/view/helper.test.php
+++ b/cake/tests/cases/libs/view/helper.test.php
@@ -341,7 +341,7 @@ class HelperTest extends CakeTestCase {
  * test getting values from Helper
  *
  * @return void
- **/
+ */
 	function testValue() {
 		$this->Helper->data = array('fullname' => 'This is me');
 		$this->Helper->setEntity('fullname');
@@ -393,7 +393,7 @@ class HelperTest extends CakeTestCase {
  * Ensure HTML escaping of url params.  So link addresses are valid and not exploited
  *
  * @return void
- **/
+ */
 	function testUrlConversion() {
 		$result = $this->Helper->url('/controller/action/1');
 		$this->assertEqual($result, '/controller/action/1');
@@ -429,7 +429,7 @@ class HelperTest extends CakeTestCase {
  * test assetTimestamp application
  *
  * @return void
- **/
+ */
 	function testAssetTimestamp() {
 		$_timestamp = Configure::read('Asset.timestamp');
 		$_debug = Configure::read('debug');
diff --git a/cake/tests/cases/libs/view/helpers/cache.test.php b/cake/tests/cases/libs/view/helpers/cache.test.php
index b52651e52..3f380b1be 100644
--- a/cake/tests/cases/libs/view/helpers/cache.test.php
+++ b/cake/tests/cases/libs/view/helpers/cache.test.php
@@ -69,7 +69,7 @@ class CacheHelperTest extends CakeTestCase {
  * Checks if TMP/views is writable, and skips the case if it is not.
  *
  * @return void
- **/
+ */
 	function skip() {
 		$this->skipUnless(is_writable(TMP . 'cache' . DS . 'views' . DS), 'TMP/views is not writable %s');
 	}
@@ -202,7 +202,7 @@ class CacheHelperTest extends CakeTestCase {
  * test that multiple <cake:nocache> tags function with multiple nocache tags in the layout.
  *
  * @return void
- **/
+ */
 	function testMultipleNoCacheTagsInViewfile() {
 		$this->Controller->cache_parsing();
 		$this->Controller->cacheAction = 21600;
@@ -282,7 +282,7 @@ class CacheHelperTest extends CakeTestCase {
  * test cacheAction set to a boolean
  *
  * @return void
- **/
+ */
 	function testCacheActionArray() {
 		$this->Controller->cache_parsing();
 		$this->Controller->cacheAction = array(
diff --git a/cake/tests/cases/libs/view/helpers/form.test.php b/cake/tests/cases/libs/view/helpers/form.test.php
index 471573250..b693c38e6 100644
--- a/cake/tests/cases/libs/view/helpers/form.test.php
+++ b/cake/tests/cases/libs/view/helpers/form.test.php
@@ -1758,7 +1758,7 @@ class FormHelperTest extends CakeTestCase {
  * test form->input() with datetime, date and time types
  *
  * @return void
- **/
+ */
 	function testInputDatetime() {
 		extract($this->dateRegex);
 		$result = $this->Form->input('Contact.created', array('type' => 'time', 'timeFormat' => 24));
@@ -1874,7 +1874,7 @@ class FormHelperTest extends CakeTestCase {
  * Test generating checkboxes in a loop.
  *
  * @return void
- **/
+ */
 	function testInputCheckboxesInLoop() {
 		for ($i = 1; $i < 5; $i++) {
 			$result = $this->Form->input("Contact.{$i}.email", array('type' => 'checkbox', 'value' => $i));
@@ -1894,7 +1894,7 @@ class FormHelperTest extends CakeTestCase {
  * test form->input() with select type inputs.
  *
  * @return void
- **/
+ */
 	function testInputSelectType() {
 		$result = $this->Form->input('email', array(
 			'options' => array('è' => 'Firést', 'é' => 'Secoènd'), 'empty' => true)
@@ -2040,7 +2040,7 @@ class FormHelperTest extends CakeTestCase {
  * test that overriding the magic select type widget is possible
  *
  * @return void
- **/
+ */
 	function testInputOverridingMagicSelectType() {
 		$view =& ClassRegistry::getObject('view');
 		$view->viewVars['users'] = array('value' => 'good', 'other' => 'bad');
@@ -2743,7 +2743,7 @@ class FormHelperTest extends CakeTestCase {
  * test disabling the hidden input for radio buttons
  *
  * @return void
- **/
+ */
 	function testRadioHiddenInputDisabling() {
 		$result = $this->Form->input('Model.1.field', array(
 				'type' => 'radio',
@@ -3043,7 +3043,7 @@ class FormHelperTest extends CakeTestCase {
  * test generation of habtm select boxes.
  *
  * @return void
- **/
+ */
 	function testHabtmSelectBox() {
 		$view =& ClassRegistry::getObject('view');
 		$view->viewVars['contactTags'] = array(
@@ -3427,7 +3427,7 @@ class FormHelperTest extends CakeTestCase {
  * Test that disabling a checkbox also disables the hidden input so no value is submitted
  *
  * @return void
- **/
+ */
 	function testCheckboxDisabling() {
 		$result = $this->Form->checkbox('Account.show_name', array('disabled' => 'disabled'));
 		$expected = array(
@@ -3441,7 +3441,7 @@ class FormHelperTest extends CakeTestCase {
  * Test that specifying false in the 'disabled' option will not disable either the hidden input or the checkbox input
  *
  * @return void
- **/
+ */
 	function testCheckboxHiddenDisabling() {
 		$result = $this->Form->checkbox('Account.show_name', array('disabled' => false));
 		$expected = array(
@@ -4685,7 +4685,7 @@ class FormHelperTest extends CakeTestCase {
  * test File upload input on a model not used in create();
  *
  * @return void
- **/
+ */
 	function testFileUploadOnOtherModel() {
 		ClassRegistry::removeObject('view');
 		$controller =& new Controller();
@@ -4816,7 +4816,7 @@ class FormHelperTest extends CakeTestCase {
  * test image submit types.
  *
  * @return void
- **/
+ */
 	function testSubmitImage() {
 		$result = $this->Form->submit('http://example.com/cake.power.gif');
 		$expected = array(
@@ -5055,7 +5055,7 @@ class FormHelperTest extends CakeTestCase {
  * test that inputDefaults are stored and used.
  *
  * @return void
- **/
+ */
 	function testCreateWithInputDefaults() {
 		$this->Form->create('User', array(
 			'inputDefaults' => array('div' => false, 'label' => false)
@@ -5080,7 +5080,7 @@ class FormHelperTest extends CakeTestCase {
  * test automatic accept-charset overriding
  *
  * @return void
- **/
+ */
 	function testCreateWithAcceptCharset() {
 		$result = $this->Form->create('UserForm', array(
 				'type' => 'post', 'action' => 'login','encoding' => 'iso-8859-1'
diff --git a/cake/tests/cases/libs/view/helpers/html.test.php b/cake/tests/cases/libs/view/helpers/html.test.php
index 4cb252a2f..1aa1b30f0 100644
--- a/cake/tests/cases/libs/view/helpers/html.test.php
+++ b/cake/tests/cases/libs/view/helpers/html.test.php
@@ -302,7 +302,7 @@ class HtmlHelperTest extends CakeTestCase {
  * test image() with Asset.timestamp
  *
  * @return void
- **/
+ */
 	function testImageTagWithTimestampping() {
 		Configure::write('Asset.timestamp', 'force');
 
@@ -438,7 +438,7 @@ class HtmlHelperTest extends CakeTestCase {
  * test use of css() and timestamping
  *
  * @return void
- **/
+ */
 	function testCssTimestamping() {
 		Configure::write('debug', 2);
 		Configure::write('Asset.timestamp', true);
@@ -482,7 +482,7 @@ class HtmlHelperTest extends CakeTestCase {
  * test timestamp enforcement for script tags.
  *
  * @return void
- **/
+ */
 	function testScriptTimestamping() {
 		$skip = $this->skipIf(!is_writable(JS), 'webroot/js is not Writable, timestamp testing has been skipped');
 		if ($skip) {
@@ -510,7 +510,7 @@ class HtmlHelperTest extends CakeTestCase {
  * test script tag generation
  *
  * @return void
- **/
+ */
 	function testScript() {
 		$result = $this->Html->script('foo');
 		$expected = array(
@@ -565,7 +565,7 @@ class HtmlHelperTest extends CakeTestCase {
  * test Script block generation
  *
  * @return void
- **/
+ */
 	function testScriptBlock() {
 		$result = $this->Html->scriptBlock('window.foo = 2;');
 		$expected = array(
@@ -615,7 +615,7 @@ class HtmlHelperTest extends CakeTestCase {
  * test script tag output buffering when using scriptStart() and scriptEnd();
  *
  * @return void
- **/
+ */
 	function testScriptStartAndScriptEnd() {
 		$result = $this->Html->scriptStart(array('safe' => true));
 		$this->assertNull($result);
diff --git a/cake/tests/cases/libs/view/helpers/javascript.test.php b/cake/tests/cases/libs/view/helpers/javascript.test.php
index ab62a8a77..378459bfe 100644
--- a/cake/tests/cases/libs/view/helpers/javascript.test.php
+++ b/cake/tests/cases/libs/view/helpers/javascript.test.php
@@ -792,7 +792,7 @@ class JavascriptTest extends CakeTestCase {
  * test string escaping and compare to json_encode()
  *
  * @return void
- **/
+ */
 	function testStringJsonEncodeCompliance() {
 		if (!function_exists('json_encode')) {
 			return;
@@ -822,7 +822,7 @@ class JavascriptTest extends CakeTestCase {
  * test that text encoded with Javascript::object decodes properly
  *
  * @return void
- **/
+ */
 	function testObjectDecodeCompatibility() {
 		if (!function_exists('json_decode')) {
 			return;
diff --git a/cake/tests/cases/libs/view/helpers/jquery_engine.test.php b/cake/tests/cases/libs/view/helpers/jquery_engine.test.php
index 5bb0d2a35..527ea7ead 100644
--- a/cake/tests/cases/libs/view/helpers/jquery_engine.test.php
+++ b/cake/tests/cases/libs/view/helpers/jquery_engine.test.php
@@ -25,7 +25,7 @@ class JqueryEngineHelperTestCase extends CakeTestCase {
  * startTest
  *
  * @return void
- **/
+ */
 	function startTest() {
 		$this->Jquery =& new JqueryEngineHelper();
 	}
@@ -34,7 +34,7 @@ class JqueryEngineHelperTestCase extends CakeTestCase {
  * end test
  *
  * @return void
- **/
+ */
 	function endTest() {
 		unset($this->Jquery);
 	}
@@ -43,7 +43,7 @@ class JqueryEngineHelperTestCase extends CakeTestCase {
  * test selector method
  *
  * @return void
- **/
+ */
 	function testSelector() {
 		$result = $this->Jquery->get('#content');
 		$this->assertEqual($result, $this->Jquery);
@@ -66,7 +66,7 @@ class JqueryEngineHelperTestCase extends CakeTestCase {
  * test event binding
  *
  * @return void
- **/
+ */
 	function testEvent() {
 		$this->Jquery->get('#myLink');
 		$result = $this->Jquery->event('click', 'doClick', array('wrap' => false));
@@ -86,7 +86,7 @@ class JqueryEngineHelperTestCase extends CakeTestCase {
  * test dom ready event creation
  *
  * @return void
- **/
+ */
 	function testDomReady() {
 		$result = $this->Jquery->domReady('foo.name = "bar";');
 		$expected = '$(document).bind("ready", function (event) {foo.name = "bar";});';
@@ -97,7 +97,7 @@ class JqueryEngineHelperTestCase extends CakeTestCase {
  * test Each method
  *
  * @return void
- **/
+ */
 	function testEach() {
 		$this->Jquery->get('#foo');
 		$result = $this->Jquery->each('$(this).hide();');
@@ -109,7 +109,7 @@ class JqueryEngineHelperTestCase extends CakeTestCase {
  * test Effect generation
  *
  * @return void
- **/
+ */
 	function testEffect() {
 		$this->Jquery->get('#foo');
 		$result = $this->Jquery->effect('show');
@@ -153,7 +153,7 @@ class JqueryEngineHelperTestCase extends CakeTestCase {
  * Test Request Generation
  *
  * @return void
- **/
+ */
 	function testRequest() {
 		$result = $this->Jquery->request(array('controller' => 'posts', 'action' => 'view', 1));
 		$expected = '$.ajax({url:"\\/posts\\/view\\/1"});';
@@ -213,7 +213,7 @@ class JqueryEngineHelperTestCase extends CakeTestCase {
  * test sortable list generation
  *
  * @return void
- **/
+ */
 	function testSortable() {
 		$this->Jquery->get('#myList');
 		$result = $this->Jquery->sortable(array(
@@ -242,7 +242,7 @@ class JqueryEngineHelperTestCase extends CakeTestCase {
  * test drag() method
  *
  * @return void
- **/
+ */
 	function testDrag() {
 		$this->Jquery->get('#element');
 		$result = $this->Jquery->drag(array(
@@ -271,7 +271,7 @@ class JqueryEngineHelperTestCase extends CakeTestCase {
  * test drop() method
  *
  * @return void
- **/
+ */
 	function testDrop() {
 		$this->Jquery->get('#element');
 		$result = $this->Jquery->drop(array(
@@ -298,7 +298,7 @@ class JqueryEngineHelperTestCase extends CakeTestCase {
  * test slider generation
  *
  * @return void
- **/
+ */
 	function testSlider() {
 		$this->Jquery->get('#element');
 		$result = $this->Jquery->slider(array(
@@ -329,7 +329,7 @@ class JqueryEngineHelperTestCase extends CakeTestCase {
  * test the serializeForm method
  *
  * @return void
- **/
+ */
 	function testSerializeForm() {
 		$this->Jquery->get('#element');
 		$result = $this->Jquery->serializeForm(array('isForm' => false));
diff --git a/cake/tests/cases/libs/view/helpers/js.test.php b/cake/tests/cases/libs/view/helpers/js.test.php
index b36ec99c5..6a79960bd 100644
--- a/cake/tests/cases/libs/view/helpers/js.test.php
+++ b/cake/tests/cases/libs/view/helpers/js.test.php
@@ -38,7 +38,7 @@ class OptionEngineHelper extends JsBaseEngineHelper {
  * test method for testing option mapping
  *
  * @return array
- **/
+ */
 	function testMap($options = array()) {
 		return $this->_mapOptions('request', $options);
 	}
@@ -46,7 +46,7 @@ class OptionEngineHelper extends JsBaseEngineHelper {
  * test method for option parsing
  *
  * @return void
- **/
+ */
 	function testParseOptions($options, $safe = array()) {
 		return $this->_parseOptions($options, $safe);
 	}
@@ -109,7 +109,7 @@ class JsHelperTestCase extends CakeTestCase {
  * Switches $this->Js to a mocked engine.
  *
  * @return void
- **/
+ */
 	function _useMock() {
 		$this->Js =& new JsHelper(array('TestJs'));
 		$this->Js->TestJsEngine =& new TestJsEngineHelper($this);
@@ -122,7 +122,7 @@ class JsHelperTestCase extends CakeTestCase {
  * test object construction
  *
  * @return void
- **/
+ */
 	function testConstruction() {
 		$js =& new JsHelper();
 		$this->assertEqual($js->helpers, array('Html', 'Form', 'JqueryEngine'));
@@ -141,7 +141,7 @@ class JsHelperTestCase extends CakeTestCase {
  * test that methods dispatch internally and to the engine class
  *
  * @return void
- **/
+ */
 	function testMethodDispatching() {
 		$this->_useMock();
 		$this->Js->TestJsEngine->expectOnce('dispatchMethod', array(new PatternExpectation('/methodOne/i'), array()));
@@ -157,7 +157,7 @@ class JsHelperTestCase extends CakeTestCase {
  * Test that method dispatching respects buffer parameters and bufferedMethods Lists.
  *
  * @return void
- **/
+ */
 	function testMethodDispatchWithBuffering() {
 		$this->_useMock();
 
@@ -209,7 +209,7 @@ class JsHelperTestCase extends CakeTestCase {
  * test that writeScripts generates scripts inline.
  *
  * @return void
- **/
+ */
 	function testWriteScriptsNoFile() {
 		$this->_useMock();
 		$this->Js->buffer('one = 1;');
@@ -236,7 +236,7 @@ class JsHelperTestCase extends CakeTestCase {
  * test that writeScripts makes files, and puts the events into them.
  *
  * @return void
- **/
+ */
 	function testWriteScriptsInFile() {
 		if ($this->skipIf(!is_writable(JS), 'webroot/js is not Writable, script caching test has been skipped')) {
 			return;
@@ -261,7 +261,7 @@ class JsHelperTestCase extends CakeTestCase {
  * test link()
  *
  * @return void
- **/
+ */
 	function testLinkWithMock() {
 		$this->_useMock();
 		$options = array('update' => '#content');
@@ -322,7 +322,7 @@ CODE;
  * test that link() and no buffering returns an <a> and <script> tags.
  *
  * @return void
- **/
+ */
 	function testLinkWithNoBuffering() {
 		$this->_useMock();
 		$this->Js->TestJsEngine->setReturnValue('dispatchMethod', 'ajax code', array('request', '*'));
@@ -359,7 +359,7 @@ CODE;
  * test submit() with a Mock to check Engine method calls
  *
  * @return void
- **/
+ */
 	function testSubmitWithMock() {
 		$this->_useMock();
 
@@ -423,7 +423,7 @@ CODE;
  * Test that Object::Object() is not breaking json output in JsHelper
  *
  * @return void
- **/
+ */
 	function testObjectPassThrough() {
 		$result = $this->Js->object(array('one' => 'first', 'two' => 'second'));
 		$expected = '{"one":"first","two":"second"}';
@@ -434,7 +434,7 @@ CODE;
  * test set()'ing variables to the Javascript buffer and controlling the output var name.
  *
  * @return void
- **/
+ */
 	function testSet() {
 		$this->Js->set('loggedIn', true);
 		$this->Js->set(array('height' => 'tall', 'color' => 'purple'));
@@ -463,7 +463,7 @@ CODE;
  * JsBaseEngine Class Test case
  *
  * @package cake.tests.view.helpers
- **/
+ */
 class JsBaseEngineTestCase extends CakeTestCase {
 /**
  * startTest method
@@ -489,7 +489,7 @@ class JsBaseEngineTestCase extends CakeTestCase {
  * test escape string skills
  *
  * @return void
- **/
+ */
 	function testEscaping() {
 		$result = $this->JsEngine->escape('');
 		$expected = '';
@@ -520,7 +520,7 @@ class JsBaseEngineTestCase extends CakeTestCase {
  * test prompt() creation
  *
  * @return void
- **/
+ */
 	function testPrompt() {
 		$result = $this->JsEngine->prompt('Hey, hey you', 'hi!');
 		$expected = 'prompt("Hey, hey you", "hi!");';
@@ -535,7 +535,7 @@ class JsBaseEngineTestCase extends CakeTestCase {
  * test alert generation
  *
  * @return void
- **/
+ */
 	function testAlert() {
 		$result = $this->JsEngine->alert('Hey there');
 		$expected = 'alert("Hey there");';
@@ -550,7 +550,7 @@ class JsBaseEngineTestCase extends CakeTestCase {
  * test confirm generation
  *
  * @return void
- **/
+ */
 	function testConfirm() {
 		$result = $this->JsEngine->confirm('Are you sure?');
 		$expected = 'confirm("Are you sure?");';
@@ -565,7 +565,7 @@ class JsBaseEngineTestCase extends CakeTestCase {
  * test Redirect
  *
  * @return void
- **/
+ */
 	function testRedirect() {
 		$result = $this->JsEngine->redirect(array('controller' => 'posts', 'action' => 'view', 1));
 		$expected = 'window.location = "/posts/view/1";';
@@ -576,7 +576,7 @@ class JsBaseEngineTestCase extends CakeTestCase {
  * testObject encoding with non-native methods.
  *
  * @return void
- **/
+ */
 	function testObject() {
 		$this->JsEngine->useNative = false;
 
@@ -620,7 +620,7 @@ class JsBaseEngineTestCase extends CakeTestCase {
  * test compatibility of JsBaseEngineHelper::object() vs. json_encode()
  *
  * @return void
- **/
+ */
 	function testObjectAgainstJsonEncode() {
 		$skip = $this->skipIf(!function_exists('json_encode'), 'json_encode() not found, comparison tests skipped. %s');
 		if ($skip) {
@@ -659,7 +659,7 @@ class JsBaseEngineTestCase extends CakeTestCase {
  * test that JSON made with JsBaseEngineHelper::object() against json_decode()
  *
  * @return void
- **/
+ */
 	function testObjectAgainstJsonDecode() {
 		$skip = $this->skipIf(!function_exists('json_encode'), 'json_encode() not found, comparison tests skipped. %s');
 		if ($skip) {
@@ -684,7 +684,7 @@ class JsBaseEngineTestCase extends CakeTestCase {
  * test Mapping of options.
  *
  * @return void
- **/
+ */
 	function testOptionMapping() {
 		$JsEngine = new OptionEngineHelper();
 		$result = $JsEngine->testMap();
@@ -704,7 +704,7 @@ class JsBaseEngineTestCase extends CakeTestCase {
  * test that option parsing escapes strings and saves what is supposed to be saved.
  *
  * @return void
- **/
+ */
 	function testOptionParsing() {
 		$JsEngine = new OptionEngineHelper();
 
diff --git a/cake/tests/cases/libs/view/helpers/mootools_engine.test.php b/cake/tests/cases/libs/view/helpers/mootools_engine.test.php
index 38ca8dbd2..d3959ac2f 100644
--- a/cake/tests/cases/libs/view/helpers/mootools_engine.test.php
+++ b/cake/tests/cases/libs/view/helpers/mootools_engine.test.php
@@ -27,7 +27,7 @@ class MooEngineHelperTestCase extends CakeTestCase {
  * startTest
  *
  * @return void
- **/
+ */
 	function startTest() {
 		$this->Moo =& new MootoolsEngineHelper();
 	}
@@ -35,7 +35,7 @@ class MooEngineHelperTestCase extends CakeTestCase {
  * end test
  *
  * @return void
- **/
+ */
 	function endTest() {
 		unset($this->Moo);
 	}
@@ -43,7 +43,7 @@ class MooEngineHelperTestCase extends CakeTestCase {
  * test selector method
  *
  * @return void
- **/
+ */
 	function testSelector() {
 		$result = $this->Moo->get('#content');
 		$this->assertEqual($result, $this->Moo);
@@ -73,7 +73,7 @@ class MooEngineHelperTestCase extends CakeTestCase {
  * test event binding
  *
  * @return void
- **/
+ */
 	function testEvent() {
 		$this->Moo->get('#myLink');
 		$result = $this->Moo->event('click', 'doClick', array('wrap' => false));
@@ -92,7 +92,7 @@ class MooEngineHelperTestCase extends CakeTestCase {
  * test dom ready event creation
  *
  * @return void
- **/
+ */
 	function testDomReady() {
 		$result = $this->Moo->domReady('foo.name = "bar";');
 		$expected = 'window.addEvent("domready", function (event) {foo.name = "bar";});';
@@ -102,7 +102,7 @@ class MooEngineHelperTestCase extends CakeTestCase {
  * test Each method
  *
  * @return void
- **/
+ */
 	function testEach() {
 		$this->Moo->get('#foo');
 		$result = $this->Moo->each('item.setStyle("display", "none");');
@@ -113,7 +113,7 @@ class MooEngineHelperTestCase extends CakeTestCase {
  * test Effect generation
  *
  * @return void
- **/
+ */
 	function testEffect() {
 		$this->Moo->get('#foo');
 		$result = $this->Moo->effect('show');
@@ -152,7 +152,7 @@ class MooEngineHelperTestCase extends CakeTestCase {
  * Test Request Generation
  *
  * @return void
- **/
+ */
 	function testRequest() {
 		$result = $this->Moo->request(array('controller' => 'posts', 'action' => 'view', 1));
 		$expected = 'var jsRequest = new Request({url:"\\/posts\\/view\\/1"}).send();';
@@ -222,7 +222,7 @@ class MooEngineHelperTestCase extends CakeTestCase {
  * test sortable list generation
  *
  * @return void
- **/
+ */
 	function testSortable() {
 		$this->Moo->get('#myList');
 		$result = $this->Moo->sortable(array(
@@ -240,7 +240,7 @@ class MooEngineHelperTestCase extends CakeTestCase {
  * test drag() method
  *
  * @return void
- **/
+ */
 	function testDrag() {
 		$this->Moo->get('#drag-me');
 		$result = $this->Moo->drag(array(
@@ -257,7 +257,7 @@ class MooEngineHelperTestCase extends CakeTestCase {
  * test drop() method
  *
  * @return void
- **/
+ */
 	function testDrop() {
 		$this->expectError();
 		$this->Moo->get('#drop-me');
@@ -291,7 +291,7 @@ class MooEngineHelperTestCase extends CakeTestCase {
  * test slider generation
  *
  * @return void
- **/
+ */
 	function testSlider() {
 		$this->Moo->get('#slider');
 		$result = $this->Moo->slider(array(
@@ -332,7 +332,7 @@ class MooEngineHelperTestCase extends CakeTestCase {
  * test the serializeForm implementation.
  *
  * @return void
- **/
+ */
 	function testSerializeForm() {
 		$this->Moo->get('#element');
 		$result = $this->Moo->serializeForm(array('isForm' => true));
diff --git a/cake/tests/cases/libs/view/helpers/paginator.test.php b/cake/tests/cases/libs/view/helpers/paginator.test.php
index 35ead9350..1749f9379 100644
--- a/cake/tests/cases/libs/view/helpers/paginator.test.php
+++ b/cake/tests/cases/libs/view/helpers/paginator.test.php
@@ -731,7 +731,7 @@ class PaginatorHelperTest extends CakeTestCase {
  * allowing you to use shortcut syntax
  *
  * @return void
- **/
+ */
 	function testPagingLinksOptionsReplaceEmptyDisabledOptions() {
 		$this->Paginator->params['paging'] = array(
 			'Client' => array(
@@ -1735,7 +1735,7 @@ class PaginatorHelperTest extends CakeTestCase {
  * test that mock classes injected into paginatorHelper are called when using link()
  *
  * @return void
- **/
+ */
 	function testMockAjaxProviderClassInjection() {
 		$Paginator =& new PaginatorHelper(array('ajax' => 'PaginatorMockJs'));
 		$Paginator->params['paging'] = array(
diff --git a/cake/tests/cases/libs/view/helpers/prototype_engine.test.php b/cake/tests/cases/libs/view/helpers/prototype_engine.test.php
index e28c3800f..829968767 100644
--- a/cake/tests/cases/libs/view/helpers/prototype_engine.test.php
+++ b/cake/tests/cases/libs/view/helpers/prototype_engine.test.php
@@ -25,7 +25,7 @@ class PrototypeEngineHelperTestCase extends CakeTestCase {
  * startTest
  *
  * @return void
- **/
+ */
 	function startTest() {
 		$this->Proto =& new PrototypeEngineHelper();
 	}
@@ -34,7 +34,7 @@ class PrototypeEngineHelperTestCase extends CakeTestCase {
  * end test
  *
  * @return void
- **/
+ */
 	function endTest() {
 		unset($this->Proto);
 	}
@@ -43,7 +43,7 @@ class PrototypeEngineHelperTestCase extends CakeTestCase {
  * test selector method
  *
  * @return void
- **/
+ */
 	function testSelector() {
 		$result = $this->Proto->get('#content');
 		$this->assertEqual($result, $this->Proto);
@@ -74,7 +74,7 @@ class PrototypeEngineHelperTestCase extends CakeTestCase {
  * test event binding
  *
  * @return void
- **/
+ */
 	function testEvent() {
 		$this->Proto->get('#myLink');
 		$result = $this->Proto->event('click', 'doClick', array('wrap' => false));
@@ -94,7 +94,7 @@ class PrototypeEngineHelperTestCase extends CakeTestCase {
  * test dom ready event creation
  *
  * @return void
- **/
+ */
 	function testDomReady() {
 		$result = $this->Proto->domReady('foo.name = "bar";');
 		$expected = 'document.observe("dom:loaded", function (event) {foo.name = "bar";});';
@@ -105,7 +105,7 @@ class PrototypeEngineHelperTestCase extends CakeTestCase {
  * test Each method
  *
  * @return void
- **/
+ */
 	function testEach() {
 		$this->Proto->get('#foo li');
 		$result = $this->Proto->each('item.hide();');
@@ -117,7 +117,7 @@ class PrototypeEngineHelperTestCase extends CakeTestCase {
  * test Effect generation
  *
  * @return void
- **/
+ */
 	function testEffect() {
 		$this->Proto->get('#foo');
 		$result = $this->Proto->effect('show');
@@ -173,7 +173,7 @@ class PrototypeEngineHelperTestCase extends CakeTestCase {
  * Test Request Generation
  *
  * @return void
- **/
+ */
 	function testRequest() {
 		$result = $this->Proto->request(array('controller' => 'posts', 'action' => 'view', 1));
 		$expected = 'var jsRequest = new Ajax.Request("/posts/view/1");';
@@ -253,7 +253,7 @@ class PrototypeEngineHelperTestCase extends CakeTestCase {
  * test sortable list generation
  *
  * @return void
- **/
+ */
 	function testSortable() {
 		$this->Proto->get('#myList');
 		$result = $this->Proto->sortable(array(
@@ -272,7 +272,7 @@ class PrototypeEngineHelperTestCase extends CakeTestCase {
  * in new Drag() when selection is a multiple type.  Iterate over the array.
  *
  * @return void
- **/
+ */
 	function testDrag() {
 		$this->Proto->get('#element');
 		$result = $this->Proto->drag(array(
@@ -301,7 +301,7 @@ class PrototypeEngineHelperTestCase extends CakeTestCase {
  * test drop() method
  *
  * @return void
- **/
+ */
 	function testDrop() {
 		$this->Proto->get('#element');
 		$result = $this->Proto->drop(array(
@@ -318,7 +318,7 @@ class PrototypeEngineHelperTestCase extends CakeTestCase {
  * ensure that slider() method behaves properly
  *
  * @return void
- **/
+ */
 	function testSlider() {
 		$this->Proto->get('#element');
 		$result = $this->Proto->slider(array(
@@ -347,7 +347,7 @@ class PrototypeEngineHelperTestCase extends CakeTestCase {
  * test the serializeForm implementation.
  *
  * @return void
- **/
+ */
 	function testSerializeForm() {
 		$this->Proto->get('#element');
 		$result = $this->Proto->serializeForm(array('isForm' => true));
diff --git a/cake/tests/cases/libs/view/helpers/session.test.php b/cake/tests/cases/libs/view/helpers/session.test.php
index eec5805c6..b72a9dd96 100644
--- a/cake/tests/cases/libs/view/helpers/session.test.php
+++ b/cake/tests/cases/libs/view/helpers/session.test.php
@@ -95,7 +95,7 @@ class SessionHelperTest extends CakeTestCase {
  * test construction and initial property settings
  *
  * @return void
- **/
+ */
 	function testConstruct() {
 		$this->assertFalse(empty($this->Session->sessionTime));
 		$this->assertFalse(empty($this->Session->security));
diff --git a/cake/tests/cases/libs/view/view.test.php b/cake/tests/cases/libs/view/view.test.php
index 04b80c930..6f52101f2 100644
--- a/cake/tests/cases/libs/view/view.test.php
+++ b/cake/tests/cases/libs/view/view.test.php
@@ -293,7 +293,7 @@ class ViewTest extends CakeTestCase {
  * test that plugin/$plugin_name is only appended to the paths it should be.
  *
  * @return void
- **/
+ */
 	function testPluginPathGeneration() {
 		$this->Controller->plugin = 'test_plugin';
 		$this->Controller->name = 'TestPlugin';
@@ -319,7 +319,7 @@ class ViewTest extends CakeTestCase {
  * test that CamelCase plugins still find their view files.
  *
  * @return void
- **/
+ */
 	function testCamelCasePluginGetTemplate() {
 		$this->Controller->plugin = 'TestPlugin';
 		$this->Controller->name = 'TestPlugin';
@@ -572,7 +572,7 @@ class ViewTest extends CakeTestCase {
  * test the correct triggering of helper callbacks
  *
  * @return void
- **/
+ */
 	function testHelperCallbackTriggering() {
 		$this->PostsController->helpers = array('Html', 'CallbackMock');
 		$View =& new TestView($this->PostsController);
@@ -702,7 +702,7 @@ class ViewTest extends CakeTestCase {
  * test rendering layout with cache helper loaded
  *
  * @return void
- **/
+ */
 	function testRenderLayoutWithMockCacheHelper() {
 		$_check = Configure::read('Cache.check');
 		Configure::write('Cache.check', true);
diff --git a/cake/tests/cases/libs/xml.test.php b/cake/tests/cases/libs/xml.test.php
index 905229917..423a73c03 100644
--- a/cake/tests/cases/libs/xml.test.php
+++ b/cake/tests/cases/libs/xml.test.php
@@ -120,7 +120,7 @@ class XmlTest extends CakeTestCase {
  * test serialization of boolean and null values.  false = 0, true = 1, null = ''
  *
  * @return void
- **/
+ */
 	function testSerializationOfBooleanAndBooleanishValues() {
 		$xml =& new Xml(array('data' => array('example' => false)));
 		$result = $xml->toString(false);
@@ -732,7 +732,7 @@ class XmlTest extends CakeTestCase {
  *
  * @access public
  * @return void
- **/
+ */
 	function testElementCollapsing() {
 		$xmlDataThatFails = '<resultpackage>
 		<result qid="46b1c46ed6208"><![CDATA[46b1c46ed3af9]]></result>
@@ -794,7 +794,7 @@ class XmlTest extends CakeTestCase {
  *
  * @see http://code.cakephp.org/tickets/view/8
  * @return void
- **/
+ */
 	function testCaseFoldingWithEmptyValues() {
 		$filledValue = '<method name="set_user_settings">
 			<title>update user information</title>
diff --git a/cake/tests/lib/cake_reporter.php b/cake/tests/lib/cake_reporter.php
index c4f7a10cd..234e8fc0b 100644
--- a/cake/tests/lib/cake_reporter.php
+++ b/cake/tests/lib/cake_reporter.php
@@ -56,7 +56,7 @@ class CakeHtmlReporter extends SimpleReporter {
  *
  * @param 
  * @return void
- **/
+ */
 	function paintGroupStart($test_name, $size) {
 		if (empty($this->_timeStart)) {
 			$this->_timeStart = $this->_getTime();
@@ -69,7 +69,7 @@ class CakeHtmlReporter extends SimpleReporter {
  * and timers are stopped.
  *
  * @return void
- **/
+ */
 	function paintGroupEnd($test_name) {
 		$this->_timeEnd = $this->_getTime();
 		$this->_timeDuration = $this->_timeEnd - $this->_timeStart;
@@ -81,7 +81,7 @@ class CakeHtmlReporter extends SimpleReporter {
  * but in a separate function to reduce dependancies.
  *
  * @return float Time in microseconds
- **/
+ */
 	function _getTime() {
 		list($usec, $sec) = explode(' ', microtime());
 		return ((float)$sec + (float)$usec);
diff --git a/cake/tests/lib/cake_test_fixture.php b/cake/tests/lib/cake_test_fixture.php
index 637aedd8b..c323f83cf 100644
--- a/cake/tests/lib/cake_test_fixture.php
+++ b/cake/tests/lib/cake_test_fixture.php
@@ -32,7 +32,7 @@ class CakeTestFixture extends Object {
  * Name of the object
  *
  * @var string
- **/
+ */
 	var $name = null;
 
 /**
diff --git a/cake/tests/lib/cake_text_reporter.php b/cake/tests/lib/cake_text_reporter.php
index 1d1424641..94b6e8d6f 100644
--- a/cake/tests/lib/cake_text_reporter.php
+++ b/cake/tests/lib/cake_text_reporter.php
@@ -11,7 +11,7 @@ class CakeTextReporter extends TextReporter {
  *
  * @param 
  * @return void
- **/
+ */
 	function paintGroupStart($test_name, $size) {
 		if (empty($this->_timeStart)) {
 			$this->_timeStart = $this->_getTime();
@@ -24,7 +24,7 @@ class CakeTextReporter extends TextReporter {
  * and timers are stopped.
  *
  * @return void
- **/
+ */
 	function paintGroupEnd($test_name) {
 		$this->_timeEnd = $this->_getTime();
 		$this->_timeDuration = $this->_timeEnd - $this->_timeStart;
@@ -36,7 +36,7 @@ class CakeTextReporter extends TextReporter {
  * but in a separate function to reduce dependancies.
  *
  * @return float Time in microseconds
- **/
+ */
 	function _getTime() {
 		list($usec, $sec) = explode(' ', microtime());
 		return ((float)$sec + (float)$usec);