diff --git a/cake/libs/view/pages/home.ctp b/cake/libs/view/pages/home.ctp
index cdccae6d9..3c61b5624 100644
--- a/cake/libs/view/pages/home.ctp
+++ b/cake/libs/view/pages/home.ctp
@@ -27,8 +27,9 @@ if (Configure::read() == 0):
 endif;
 ?>
 <h2><?php echo sprintf(__('Release Notes for CakePHP %s.', true), Configure::version()); ?></h2>
-<a href="http://code.cakephp.org/wiki/changelog/1_2_x_x"><?php __('Read the changelog'); ?> </a>
 <?php
+echo $this->Html->link(__('Read the changelog', true), 'http://code.cakephp.org/wiki/changelog/1_2_x_x');
+
 if (Configure::read() > 0):
 	Debugger::checkSessionKey();
 endif;
@@ -107,13 +108,27 @@ To change its layout, create: APP/views/layouts/default.ctp.<br />
 You can also add some CSS styles for your pages at: APP/webroot/css.');
 ?>
 </p>
+
 <h3><?php __('Getting Started'); ?></h3>
 <p>
-	<a href="http://book.cakephp.org"><strong>new</strong> CakePHP 1.2 Docs</a>
+	<?php
+		echo $this->Html->link(
+			sprintf('<strong>%s</strong>%s', __('new', true ), __('CakePHP 1.2 Docs', true )),
+			'http://book.cakephp.org',
+			array('target' => '_blank', 'escape' => false)
+		);
+	?>
 </p>
 <p>
-	<a href="http://book.cakephp.org/view/219/the-cakephp-blog-tutorial"><?php __('The 15 min Blog Tutorial'); ?></a><br />
+	<?php
+		echo $this->Html->link(
+			__('The 15 min Blog Tutorial', true),
+			'http://book.cakephp.org/view/219/the-cakephp-blog-tutorial',
+			array('target' => '_blank', 'escape' => false)
+		);
+	?>
 </p>
+
 <h3><?php __('More about Cake'); ?></h3>
 <p>
 <?php __('CakePHP is a rapid development framework for PHP which uses commonly known design patterns like Active Record, Association Data Mapping, Front Controller and MVC.'); ?>
@@ -121,30 +136,78 @@ You can also add some CSS styles for your pages at: APP/webroot/css.');
 <p>
 <?php __('Our primary goal is to provide a structured framework that enables PHP users at all levels to rapidly develop robust web applications, without any loss to flexibility.'); ?>
 </p>
-<br />
+
 <ul>
-	<li><a href="http://www.cakefoundation.org/"><?php __('Cake Software Foundation'); ?> </a>
-	<ul><li><?php __('Promoting development related to CakePHP'); ?></li></ul></li>
-	<li><a href="http://www.cakephp.org"><?php __('CakePHP'); ?> </a>
-	<ul><li><?php __('The Rapid Development Framework'); ?></li></ul></li>
-	<li><a href="http://book.cakephp.org"><?php __('CakePHP Documentation'); ?> </a>
-	<ul><li><?php __('Your Rapid Development Cookbook'); ?></li></ul></li>
-	<li><a href="http://api.cakephp.org"><?php __('CakePHP API'); ?> </a>
-	<ul><li><?php __('Quick Reference'); ?></li></ul></li>
-	<li><a href="http://bakery.cakephp.org"><?php __('The Bakery'); ?> </a>
-	<ul><li><?php __('Everything CakePHP'); ?></li></ul></li>
-	<li><a href="http://live.cakephp.org"><?php __('The Show'); ?> </a>
-	<ul><li><?php __('The Show is a live and archived internet radio broadcast CakePHP-related topics and answer questions live via IRC, Skype, and telephone.'); ?></li></ul></li>
-	<li><a href="http://groups.google.com/group/cake-php"><?php __('CakePHP Google Group'); ?> </a>
-	<ul><li><?php __('Community mailing list'); ?></li></ul></li>
-	<li><a href="irc://irc.freenode.net/cakephp">irc.freenode.net #cakephp</a>
-	<ul><li><?php __('Live chat about CakePHP'); ?></li></ul></li>
-	<li><a href="https://code.cakephp.org/"><?php __('CakePHP Code'); ?> </a>
-	<ul><li><?php __('For the Development of CakePHP (Tickets, Git browser, Roadmap, Changelogs)'); ?></li></ul></li>
-	<li><a href="http://www.cakeforge.org"><?php __('CakeForge'); ?> </a>
-	<ul><li><?php __('Open Development for CakePHP'); ?></li></ul></li>
-	<li><a href="http://astore.amazon.com/cakesoftwaref-20/"><?php __('Book Store'); ?> </a>
-	<ul><li><?php __('Recommended Software Books'); ?></li></ul></li>
-	<li><a href="http://www.cafepress.com/cakefoundation"><?php __('CakePHP gear'); ?> </a>
-	<ul><li><?php __('Get your own CakePHP gear - Doughnate to Cake'); ?></li></ul></li>
+	<li>
+		<?php
+			echo $this->Html->link(__('Cake Software Foundation', true), 'http://www.cakefoundation.org/');
+		?>
+		<ul><li><?php __('Promoting development related to CakePHP'); ?></li></ul>
+	</li>
+	<li>
+		<?php
+			echo $this->Html->link(__('CakePHP', true), 'http://www.cakephp.org');
+		?>
+		<ul><li><?php __('The Rapid Development Framework'); ?></li></ul>
+	</li>
+	<li>
+		<?php
+			echo $this->Html->link(__('CakePHP Documentation', true), 'http://book.cakephp.org');
+		?>
+		<ul><li><?php __('Your Rapid Development Cookbook'); ?></li></ul>
+	</li>
+	<li>
+		<?php
+			echo $this->Html->link(__('CakePHP API', true), 'http://api.cakephp.org');
+		?>
+		<ul><li><?php __('Quick Reference'); ?></li></ul>
+	</li>
+	<li>
+		<?php
+			echo $this->Html->link(__('The Bakery', true), 'http://bakery.cakephp.org');
+		?>
+		<ul><li><?php __('Everything CakePHP'); ?></li></ul>
+	</li>
+	<li>
+		<?php
+			echo $this->Html->link(__('The Show', true), 'http://live.cakephp.org');
+		?>
+		<ul><li><?php __('The Show is a live and archived internet radio broadcast CakePHP-related topics and answer questions live via IRC, Skype, and telephone.'); ?></li></ul>
+	</li>
+	<li>
+		<?php
+			echo $this->Html->link(__('CakePHP Google Group', true), 'http://groups.google.com/group/cake-php');
+		?>
+		<ul><li><?php __('Community mailing list'); ?></li></ul>
+	</li>
+	<li>
+		<?php
+			echo $this->Html->link(__('irc.freenode.net #cakephp', true), 'irc://irc.freenode.net/cakephp');
+		?>
+		<ul><li><?php __('Live chat about CakePHP'); ?></li></ul>
+	</li>
+	<li>
+		<?php
+			echo $this->Html->link(__('CakePHP Code', true), 'http://code.cakephp.org/');
+		?>
+		<ul><li><?php __('For the Development of CakePHP (Tickets, Git browser, Roadmap, Changelogs)'); ?></li></ul>
+	</li>
+	<li>
+		<?php
+			echo $this->Html->link(__('CakeForge', true), 'http://www.cakeforge.org');
+		?>
+		<ul><li><?php __('Open Development for CakePHP'); ?></li></ul>
+	</li>
+	<li>
+		<?php
+			echo $this->Html->link(__('Book Store', true), 'http://astore.amazon.com/cakesoftwaref-20/');
+		?>
+		<ul><li><?php __('Recommended Software Books'); ?></li></ul>
+	</li>
+	<li>
+		<?php
+			echo $this->Html->link(__('CakePHP gear', true), 'http://www.cafepress.com/cakefoundation');
+		?>
+		<ul><li><?php __('Get your own CakePHP gear - Doughnate to Cake'); ?></li></ul>
+	</li>
 </ul>
\ No newline at end of file
diff --git a/cake/tests/cases/libs/inflector.test.php b/cake/tests/cases/libs/inflector.test.php
index aef2a660f..9d9afa6fc 100644
--- a/cake/tests/cases/libs/inflector.test.php
+++ b/cake/tests/cases/libs/inflector.test.php
@@ -12,12 +12,12 @@
  * Licensed under The Open Group Test Suite License
  * Redistributions of files must retain the above copyright notice.
  *
- * @copyright     Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://book.cakephp.org/view/160/Testing
- * @package       cake.tests
- * @subpackage    cake.tests.cases.libs
- * @since         CakePHP(tm) v 1.2.0.4206
- * @license       Open Group Test Suite License (http://www.opensource.org/licenses/opengroup.php)
+ * @copyright	  Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link		  http://book.cakephp.org/view/160/Testing
+ * @package		  cake.tests
+ * @subpackage	  cake.tests.cases.libs
+ * @since		  CakePHP(tm) v 1.2.0.4206
+ * @license		  Open Group Test Suite License (http://www.opensource.org/licenses/opengroup.php)
  */
 
 /**
@@ -29,8 +29,8 @@ App::import('Core', 'Inflector');
 /**
  * Short description for class.
  *
- * @package       cake.tests
- * @subpackage    cake.tests.cases.libs
+ * @package		  cake.tests
+ * @subpackage	  cake.tests.cases.libs
  */
 class InflectorTest extends CakeTestCase {
 
@@ -112,7 +112,7 @@ class InflectorTest extends CakeTestCase {
 		$this->assertEqual(Inflector::singularize('Taxes'), 'Tax');
 		$this->assertEqual(Inflector::singularize('faxes'), 'fax');
 		$this->assertEqual(Inflector::singularize('waxes'), 'wax');
-        $this->assertEqual(Inflector::singularize('niches'), 'niche');
+		$this->assertEqual(Inflector::singularize('niches'), 'niche');
 		$this->assertEqual(Inflector::singularize('waves'), 'wave');
 		$this->assertEqual(Inflector::singularize(''), '');
 	}
@@ -302,19 +302,19 @@ class InflectorTest extends CakeTestCase {
 		Inflector::rules('plural', array('/^(custom)$/i' => '\1izables'));
 		$this->assertEqual(Inflector::pluralize('custom'), 'customizables');
 
-        Inflector::rules('plural', array('uninflected' => array('uninflectable')));
-        $this->assertEqual(Inflector::pluralize('uninflectable'), 'uninflectable');
+		Inflector::rules('plural', array('uninflected' => array('uninflectable')));
+		$this->assertEqual(Inflector::pluralize('uninflectable'), 'uninflectable');
 
-        Inflector::rules('plural', array(
-            'rules' => array('/^(alert)$/i' => '\1ables'),
-            'uninflected' => array('noflect', 'abtuse'),
-            'irregular' => array('amaze' => 'amazable', 'phone' => 'phonezes')
-        ));
-        $this->assertEqual(Inflector::pluralize('noflect'), 'noflect');
-        $this->assertEqual(Inflector::pluralize('abtuse'), 'abtuse');
-        $this->assertEqual(Inflector::pluralize('alert'), 'alertables');
-        $this->assertEqual(Inflector::pluralize('amaze'), 'amazable');
-        $this->assertEqual(Inflector::pluralize('phone'), 'phonezes');
+		Inflector::rules('plural', array(
+			'rules' => array('/^(alert)$/i' => '\1ables'),
+			'uninflected' => array('noflect', 'abtuse'),
+			'irregular' => array('amaze' => 'amazable', 'phone' => 'phonezes')
+		));
+		$this->assertEqual(Inflector::pluralize('noflect'), 'noflect');
+		$this->assertEqual(Inflector::pluralize('abtuse'), 'abtuse');
+		$this->assertEqual(Inflector::pluralize('alert'), 'alertables');
+		$this->assertEqual(Inflector::pluralize('amaze'), 'amazable');
+		$this->assertEqual(Inflector::pluralize('phone'), 'phonezes');
 	}
 
 /**
@@ -323,23 +323,23 @@ class InflectorTest extends CakeTestCase {
  * @access public
  * @return void
  */
-    function testCustomSingularRule() {
-        Inflector::rules('singular', array('/(eple)r$/i' => '\1', '/(jente)r$/i' => '\1'));
+	function testCustomSingularRule() {
+		Inflector::rules('singular', array('/(eple)r$/i' => '\1', '/(jente)r$/i' => '\1'));
 
-        $this->assertEqual(Inflector::singularize('epler'), 'eple');
-        $this->assertEqual(Inflector::singularize('jenter'), 'jente');
+		$this->assertEqual(Inflector::singularize('epler'), 'eple');
+		$this->assertEqual(Inflector::singularize('jenter'), 'jente');
 
-        Inflector::rules('singular', array(
-            'rules' => array('/^(bil)er$/i' => '\1', '/^(inflec|contribu)tors$/i' => '\1ta'),
-            'uninflected' => array('singulars'),
-            'irregular' => array('spins' => 'spinor')
-        ));
+		Inflector::rules('singular', array(
+			'rules' => array('/^(bil)er$/i' => '\1', '/^(inflec|contribu)tors$/i' => '\1ta'),
+			'uninflected' => array('singulars'),
+			'irregular' => array('spins' => 'spinor')
+		));
 
-        $this->assertEqual(Inflector::singularize('inflectors'), 'inflecta');
-        $this->assertEqual(Inflector::singularize('contributors'), 'contributa');
-        $this->assertEqual(Inflector::singularize('spins'), 'spinor');
-        $this->assertEqual(Inflector::singularize('singulars'), 'singulars');
-    }
+		$this->assertEqual(Inflector::singularize('inflectors'), 'inflecta');
+		$this->assertEqual(Inflector::singularize('contributors'), 'contributa');
+		$this->assertEqual(Inflector::singularize('spins'), 'spinor');
+		$this->assertEqual(Inflector::singularize('singulars'), 'singulars');
+	}
 
 /**
  * tearDown method