Updated .gitignore, synced app & skel

Added some good practice rules from https://help.github.com/articles/ignoring-files to gitignore
Changed .gitignore to only ignore /app/Config/database.php instead of all files in /app/Config/ (helps to keep it in sync with its skel folder!)

Brought \app\ and \lib\Cake\Console\Templates\skel\ in sync
Fixed various @package annotations in \app\
Fixed various @package annotations in \lib\Cake\Console\Templates\skel\

.gitignore

@@ -1,9 +1,21 @@
-/app/Config
+# User specific & automatically generated files #
+#################################################
+/app/Config/database.php
 /app/tmp
 /lib/Cake/Console/Templates/skel/tmp/
 /plugins
 /vendors
 /build
 /dist
-.DS_Store
 /tags
+
+# OS generated files #
+######################
+.DS_Store
+.DS_Store?
+._*
+.Spotlight-V100
+.Trashes
+Icon?
+ehthumbs.db
+Thumbs.db

app/Config/Schema/i18n.php

@@ -20,9 +20,7 @@
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 
-// @codingStandardsIgnoreStart
+/**
-
-/*
  *
  * Using the Schema command line utility
  *
@@ -30,9 +28,7 @@
  *
  * cake schema run create i18n
  */
-class i18nSchema extends CakeSchema {
+class I18nSchema extends CakeSchema {
-
-// @codingStandardsIgnoreEnd
 
 	public $name = 'i18n';
 

app/Config/core.php

@@ -95,7 +95,7 @@
  *
  * And uncomment the App.baseUrl below. But keep in mind
  * that plugin assets such as images, CSS and Javascript files
- * will not work without url rewriting
+ * will not work without url rewriting!
  * To work around this issue you should either symlink or copy
  * the plugin assets into you app's webroot directory. This is
  * recommended even when you are using mod_rewrite. Handling static

app/Config/database.php.default

@@ -18,13 +18,7 @@
  * @package       app.Config
  * @since         CakePHP(tm) v 0.2.9
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
- */
-/**
- * In this file you set up your database connection details.
  *
- * @package       cake.config
- */
-/**
  * Database configuration class.
  * You can specify multiple configurations for production, development and testing.
  *

app/Config/email.php.default

@@ -18,13 +18,7 @@
  * @package       app.Config
  * @since         CakePHP(tm) v 2.0.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
- */
-/**
- * In this file you set up your send email details.
  *
- * @package       cake.config
- */
-/**
  * Email configuration class.
  * You can specify multiple configurations for production, development and testing.
  *

app/Console/cake

@@ -13,7 +13,7 @@
 #
 # @copyright    Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
 # @link         http://cakephp.org CakePHP(tm) Project
-# @package      cake.Console
+# @package      app.Console
 # @since        CakePHP(tm) v 1.2.0.5012
 # @license      MIT License (http://www.opensource.org/licenses/mit-license.php)
 #

app/Console/cake.php

@@ -23,10 +23,13 @@ $dispatcher = 'Cake' . $ds . 'Console' . $ds . 'ShellDispatcher.php';
 
 if (function_exists('ini_set')) {
 	$root = dirname(dirname(dirname(__FILE__)));
+
+	// the following line differs from its sibling
+	// /lib/Cake/Console/Templates/skel/Console/cake.php
 	ini_set('include_path', $root . $ds . 'lib' . PATH_SEPARATOR . ini_get('include_path'));
 }
 
-if (!include ($dispatcher)) {
+if (!include($dispatcher)) {
 	trigger_error('Could not locate CakePHP core files.', E_USER_ERROR);
 }
 unset($paths, $path, $dispatcher, $root, $ds);

app/Controller/AppController.php

@@ -20,7 +20,6 @@
  * @since         CakePHP(tm) v 0.2.9
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-
 App::uses('Controller', 'Controller');
 
 /**

app/Controller/PagesController.php

@@ -19,7 +19,6 @@
  * @since         CakePHP(tm) v 0.2.9
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-
 App::uses('AppController', 'Controller');
 
 /**

app/View/Emails/html/default.ctp

@@ -12,7 +12,7 @@
  *
  * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       Cake.View.Emails.html
+ * @package       app.View.Emails.html
  * @since         CakePHP(tm) v 0.10.0.1076
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */

app/View/Emails/text/default.ctp

@@ -12,7 +12,7 @@
  *
  * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       Cake.View.Emails.text
+ * @package       app.View.Emails.text
  * @since         CakePHP(tm) v 0.10.0.1076
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */

app/View/Errors/error400.ctp

@@ -12,7 +12,7 @@
  *
  * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       Cake.View.Errors
+ * @package       app.View.Errors
  * @since         CakePHP(tm) v 0.10.0.1076
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -26,7 +26,7 @@
 	); ?>
 </p>
 <?php
-if (Configure::read('debug') > 0 ):
+if (Configure::read('debug') > 0):
 	echo $this->element('exception_stack_trace');
 endif;
 ?>

app/View/Errors/error500.ctp

@@ -12,7 +12,7 @@
  *
  * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       Cake.View.Errors
+ * @package       app.View.Errors
  * @since         CakePHP(tm) v 0.10.0.1076
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -23,7 +23,7 @@
 	<?php echo __d('cake', 'An Internal Error Has Occurred.'); ?>
 </p>
 <?php
-if (Configure::read('debug') > 0 ):
+if (Configure::read('debug') > 0):
 	echo $this->element('exception_stack_trace');
 endif;
 ?>

app/View/Helper/AppHelper.php

@@ -20,7 +20,6 @@
  * @since         CakePHP(tm) v 0.2.9
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-
 App::uses('Helper', 'View');
 
 /**

app/View/Layouts/Emails/html/default.ctp

@@ -12,7 +12,7 @@
  *
  * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       Cake.View.Layouts.Emails.html
+ * @package       app.View.Layouts.Email.html
  * @since         CakePHP(tm) v 0.10.0.1076
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -20,10 +20,10 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
 <head>
-	<title><?php echo $title_for_layout;?></title>
+	<title><?php echo $title_for_layout; ?></title>
 </head>
 <body>
-	<?php echo $this->fetch('content');?>
+	<?php echo $this->fetch('content'); ?>
 
 	<p>This email was sent using the <a href="http://cakephp.org">CakePHP Framework</a></p>
 </body>

app/View/Layouts/Emails/text/default.ctp

@@ -12,11 +12,11 @@
  *
  * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       Cake.View.Layouts.Emails.text
+ * @package       app.View.Layouts.Email.text
  * @since         CakePHP(tm) v 0.10.0.1076
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 ?>
-<?php echo $this->fetch('content');?>
+<?php echo $this->fetch('content'); ?>
 
 This email was sent using the CakePHP Framework, http://cakephp.org.

app/View/Layouts/ajax.ctp

@@ -12,7 +12,7 @@
  *
  * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       Cake.View.Layouts
+ * @package       app.View.Layouts
  * @since         CakePHP(tm) v 0.10.0.1076
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */

app/View/Layouts/default.ctp

@@ -12,7 +12,7 @@
  *
  * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       Cake.View.Layouts
+ * @package       app.View.Layouts
  * @since         CakePHP(tm) v 0.10.0.1076
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */

app/View/Layouts/error.ctp

@@ -12,7 +12,7 @@
  *
  * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       Cake.View.Layouts
+ * @package       app.View.Layouts
  * @since         CakePHP(tm) v 0.10.0.1076
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */

app/View/Layouts/flash.ctp

@@ -12,7 +12,7 @@
  *
  * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       Cake.View.Layouts
+ * @package       app.View.Layouts
  * @since         CakePHP(tm) v 0.10.0.1076
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */

app/View/Pages/home.ctp

@@ -12,7 +12,7 @@
  *
  * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       Cake.View.Pages
+ * @package       app.View.Pages
  * @since         CakePHP(tm) v 0.10.0.1076
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */

app/webroot/index.php

@@ -39,6 +39,7 @@ if (!defined('DS')) {
 if (!defined('ROOT')) {
 	define('ROOT', dirname(dirname(dirname(__FILE__))));
 }
+
 /**
  * The actual directory name for the "app".
  *
@@ -57,8 +58,11 @@ if (!defined('APP_DIR')) {
  * cannot modify your include_path set this value.
  *
  * Leaving this constant undefined will result in it being defined in Cake/bootstrap.php
+ *
+ * The following line differs from its sibling
+ * /lib/Cake/Console/Templates/skel/webroot/index.php
  */
-	//define('CAKE_CORE_INCLUDE_PATH', ROOT . DS . 'lib');
+//define('CAKE_CORE_INCLUDE_PATH', ROOT . DS . 'lib');
 
 /**
  * Editing below this line should NOT be necessary.
@@ -84,11 +88,11 @@ if (!defined('CAKE_CORE_INCLUDE_PATH')) {
 	if (function_exists('ini_set')) {
 		ini_set('include_path', ROOT . DS . 'lib' . PATH_SEPARATOR . ini_get('include_path'));
 	}
-	if (!include ('Cake' . DS . 'bootstrap.php')) {
+	if (!include('Cake' . DS . 'bootstrap.php')) {
 		$failed = true;
 	}
 } else {
-	if (!include (CAKE_CORE_INCLUDE_PATH . DS . 'Cake' . DS . 'bootstrap.php')) {
+	if (!include(CAKE_CORE_INCLUDE_PATH . DS . 'Cake' . DS . 'bootstrap.php')) {
 		$failed = true;
 	}
 }
@@ -98,6 +102,8 @@ if (!empty($failed)) {
 
 App::uses('Dispatcher', 'Routing');
 
-
 $Dispatcher = new Dispatcher();
-$Dispatcher->dispatch(new CakeRequest(), new CakeResponse());
+$Dispatcher->dispatch(
+	new CakeRequest(),
+	new CakeResponse()
+);

app/webroot/test.php

@@ -25,6 +25,7 @@ ini_set('display_errors', 1);
 if (!defined('DS')) {
 	define('DS', DIRECTORY_SEPARATOR);
 }
+
 /**
  * These defines should only be edited if you have cake installed in
  * a directory layout other than the way it is distributed.
@@ -38,6 +39,7 @@ if (!defined('DS')) {
 if (!defined('ROOT')) {
 	define('ROOT', dirname(dirname(dirname(__FILE__))));
 }
+
 /**
  * The actual directory name for the "app".
  *
@@ -53,8 +55,11 @@ if (!defined('APP_DIR')) {
  * need to cannot modify your include_path, you can set this path.
  *
  * Leaving this constant undefined will result in it being defined in Cake/bootstrap.php
+ *
+ * The following line differs from its sibling
+ * /lib/Cake/Console/Templates/skel/webroot/test.php
  */
-	//define('CAKE_CORE_INCLUDE_PATH', ROOT . DS . 'lib');
+//define('CAKE_CORE_INCLUDE_PATH', ROOT . DS . 'lib');
 
 /**
  * Editing below this line should not be necessary.
@@ -72,11 +77,11 @@ if (!defined('CAKE_CORE_INCLUDE_PATH')) {
 	if (function_exists('ini_set')) {
 		ini_set('include_path', ROOT . DS . 'lib' . PATH_SEPARATOR . ini_get('include_path'));
 	}
-	if (!include ('Cake' . DS . 'bootstrap.php')) {
+	if (!include('Cake' . DS . 'bootstrap.php')) {
 		$failed = true;
 	}
 } else {
-	if (!include (CAKE_CORE_INCLUDE_PATH . DS . 'Cake' . DS . 'bootstrap.php')) {
+	if (!include(CAKE_CORE_INCLUDE_PATH . DS . 'Cake' . DS . 'bootstrap.php')) {
 		$failed = true;
 	}
 }

lib/Cake/Console/Templates/skel/Config/Schema/i18n.php

@@ -20,9 +20,7 @@
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 
-// @codingStandardsIgnoreStart
+/**
-
-/*
  *
  * Using the Schema command line utility
  *
@@ -30,9 +28,7 @@
  *
  * cake schema run create i18n
  */
-class i18nSchema extends CakeSchema {
+class I18nSchema extends CakeSchema {
-
-// @codingStandardsIgnoreEnd
 
 	public $name = 'i18n';
 

lib/Cake/Console/Templates/skel/Config/core.php

@@ -95,7 +95,7 @@
  *
  * And uncomment the App.baseUrl below. But keep in mind
  * that plugin assets such as images, CSS and Javascript files
- * will not work without url rewriting
+ * will not work without url rewriting!
  * To work around this issue you should either symlink or copy
  * the plugin assets into you app's webroot directory. This is
  * recommended even when you are using mod_rewrite. Handling static

lib/Cake/Console/Templates/skel/Config/database.php.default

@@ -18,13 +18,7 @@
  * @package       app.Config
  * @since         CakePHP(tm) v 0.2.9
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
- */
-/**
- * In this file you set up your database connection details.
  *
- * @package       cake.config
- */
-/**
  * Database configuration class.
  * You can specify multiple configurations for production, development and testing.
  *

lib/Cake/Console/Templates/skel/Config/email.php.default

@@ -18,13 +18,7 @@
  * @package       app.Config
  * @since         CakePHP(tm) v 2.0.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
- */
-/**
- * In this file you set up your send email details.
  *
- * @package       cake.config
- */
-/**
  * Email configuration class.
  * You can specify multiple configurations for production, development and testing.
  *

lib/Cake/Console/Templates/skel/Console/cake

@@ -13,7 +13,7 @@
 #
 # @copyright    Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
 # @link         http://cakephp.org CakePHP(tm) Project
-# @package      cake.Console
+# @package      app.Console
 # @since        CakePHP(tm) v 1.2.0.5012
 # @license      MIT License (http://www.opensource.org/licenses/mit-license.php)
 #

lib/Cake/Console/Templates/skel/Console/cake.php

@@ -23,10 +23,13 @@ $dispatcher = 'Cake' . $ds . 'Console' . $ds . 'ShellDispatcher.php';
 
 if (function_exists('ini_set')) {
 	$root = dirname(dirname(dirname(__FILE__)));
+
+	// the following line differs from its sibling
+	// /app/Console/cake.php
 	ini_set('include_path', $root . PATH_SEPARATOR . __CAKE_PATH__ . PATH_SEPARATOR . ini_get('include_path'));
 }
 
-if (!include $dispatcher) {
+if (!include($dispatcher)) {
 	trigger_error('Could not locate CakePHP core files.', E_USER_ERROR);
 }
 unset($paths, $path, $dispatcher, $root, $ds);

lib/Cake/Console/Templates/skel/Controller/AppController.php

@@ -20,7 +20,6 @@
  * @since         CakePHP(tm) v 0.2.9
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-
 App::uses('Controller', 'Controller');
 
 /**

lib/Cake/Console/Templates/skel/Controller/PagesController.php

@@ -31,6 +31,13 @@ App::uses('AppController', 'Controller');
  */
 class PagesController extends AppController {
 
+/**
+ * Controller name
+ *
+ * @var string
+ */
+	public $name = 'Pages';
+
 /**
  * This controller does not use a model
  *
@@ -41,7 +48,8 @@ class PagesController extends AppController {
 /**
  * Displays a view
  *
- * @param string What page to display
+ * @param mixed What page to display
+ * @return void
  */
 	public function display() {
 		$path = func_get_args();
@@ -50,7 +58,7 @@ class PagesController extends AppController {
 		if (!$count) {
 			$this->redirect('/');
 		}
-		$page = $subpage = $title = null;
+		$page = $subpage = $title_for_layout = null;
 
 		if (!empty($path[0])) {
 			$page = $path[0];
@@ -59,11 +67,9 @@ class PagesController extends AppController {
 			$subpage = $path[1];
 		}
 		if (!empty($path[$count - 1])) {
-			$title = Inflector::humanize($path[$count - 1]);
+			$title_for_layout = Inflector::humanize($path[$count - 1]);
 		}
-		$this->set(compact('page', 'subpage'));
+		$this->set(compact('page', 'subpage', 'title_for_layout'));
-		$this->set('title_for_layout', $title);
 		$this->render(implode('/', $path));
 	}
-
 }

lib/Cake/Console/Templates/skel/View/Emails/html/default.ctp

@@ -21,6 +21,6 @@
 $content = explode("\n", $content);
 
 foreach ($content as $line):
-	echo '<p> ' . $line . '</p>';
+	echo '<p> ' . $line . "</p>\n";
 endforeach;
 ?>

lib/Cake/Console/Templates/skel/View/Errors/error400.ctp

@@ -12,7 +12,7 @@
  *
  * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       Cake.View.Errors
+ * @package       app.View.Errors
  * @since         CakePHP(tm) v 0.10.0.1076
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */

lib/Cake/Console/Templates/skel/View/Errors/error500.ctp

@@ -12,7 +12,7 @@
  *
  * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       Cake.View.Errors
+ * @package       app.View.Errors
  * @since         CakePHP(tm) v 0.10.0.1076
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */

lib/Cake/Console/Templates/skel/View/Layouts/Emails/html/default.ctp

@@ -18,12 +18,10 @@
  */
 ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
-
 <html>
 <head>
 	<title><?php echo $title_for_layout; ?></title>
 </head>
-
 <body>
 	<?php echo $this->fetch('content'); ?>
 

lib/Cake/Console/Templates/skel/View/Layouts/Emails/text/default.ctp

@@ -17,7 +17,6 @@
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 ?>
-
 <?php echo $this->fetch('content'); ?>
 
 This email was sent using the CakePHP Framework, http://cakephp.org.

lib/Cake/Console/Templates/skel/View/Layouts/default.ctp

@@ -16,13 +16,15 @@
  * @since         CakePHP(tm) v 0.10.0.1076
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
+
+$cakeDescription = __d('cake_dev', 'CakePHP: the rapid development php framework');
 ?>
 <!DOCTYPE html>
 <html>
 <head>
 	<?php echo $this->Html->charset(); ?>
 	<title>
-		<?php echo __('CakePHP: the rapid development php framework:'); ?>
+		<?php echo $cakeDescription ?>:
 		<?php echo $title_for_layout; ?>
 	</title>
 	<?php
@@ -38,7 +40,7 @@
 <body>
 	<div id="container">
 		<div id="header">
-			<h1><?php echo $this->Html->link(__('CakePHP: the rapid development php framework'), 'http://cakephp.org'); ?></h1>
+			<h1><?php echo $this->Html->link($cakeDescription, 'http://cakephp.org'); ?></h1>
 		</div>
 		<div id="content">
 
@@ -48,7 +50,7 @@
 		</div>
 		<div id="footer">
 			<?php echo $this->Html->link(
-					$this->Html->image('cake.power.gif', array('alt' => __('CakePHP: the rapid development php framework'), 'border' => '0')),
+					$this->Html->image('cake.power.gif', array('alt' => $cakeDescription, 'border' => '0')),
 					'http://www.cakephp.org/',
 					array('target' => '_blank', 'escape' => false)
 				);

lib/Cake/Console/Templates/skel/View/Layouts/error.ctp

@@ -16,13 +16,15 @@
  * @since         CakePHP(tm) v 0.10.0.1076
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
+
+$cakeDescription = __d('cake_dev', 'CakePHP: the rapid development php framework');
 ?>
 <!DOCTYPE html>
 <html>
 <head>
 	<?php echo $this->Html->charset(); ?>
 	<title>
-		<?php echo __('CakePHP: the rapid development php framework:'); ?>
+		<?php echo $cakeDescription ?>:
 		<?php echo $title_for_layout; ?>
 	</title>
 	<?php
@@ -38,7 +40,7 @@
 <body>
 	<div id="container">
 		<div id="header">
-			<h1><?php echo $this->Html->link(__('CakePHP: the rapid development php framework'), 'http://cakephp.org'); ?></h1>
+			<h1><?php echo $this->Html->link($cakeDescription, 'http://cakephp.org'); ?></h1>
 		</div>
 		<div id="content">
 
@@ -48,7 +50,7 @@
 		</div>
 		<div id="footer">
 			<?php echo $this->Html->link(
-					$this->Html->image('cake.power.gif', array('alt' => __('CakePHP: the rapid development php framework'), 'border' => '0')),
+					$this->Html->image('cake.power.gif', array('alt' => $cakeDescription, 'border' => '0')),
 					'http://www.cakephp.org/',
 					array('target' => '_blank', 'escape' => false)
 				);

lib/Cake/Console/Templates/skel/View/Layouts/flash.ctp

@@ -24,7 +24,7 @@
 <title><?php echo $page_title; ?></title>
 
 <?php if (Configure::read('debug') == 0) { ?>
-<meta http-equiv="Refresh" content="<?php echo $pause?>;url=<?php echo $url?>"/>
+<meta http-equiv="Refresh" content="<?php echo $pause; ?>;url=<?php echo $url; ?>"/>
 <?php } ?>
 <style><!--
 P { text-align:center; font:bold 1.1em sans-serif }
@@ -33,6 +33,6 @@ A:HOVER { text-decoration: underline; color:#44E }
 --></style>
 </head>
 <body>
-<p><a href="<?php echo $url?>"><?php echo $message?></a></p>
+<p><a href="<?php echo $url; ?>"><?php echo $message; ?></a></p>
 </body>
 </html>

lib/Cake/Console/Templates/skel/View/Pages/home.ctp

@@ -12,7 +12,7 @@
  *
  * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       Cake.View.Pages
+ * @package       app.View.Pages
  * @since         CakePHP(tm) v 0.10.0.1076
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -21,11 +21,10 @@ if (!Configure::read('debug')):
 endif;
 App::uses('Debugger', 'Utility');
 ?>
-<iframe src="http://cakephp.org/bake-banner" width="830" height="160" style="overflow:hidden; border:none;">
-	<p>For updates and important announcements, visit http://cakefest.org</p>
-</iframe>
 <h2><?php echo __d('cake_dev', 'Release Notes for CakePHP %s.', Configure::version()); ?></h2>
-<a href="http://cakephp.org/changelogs/<?php echo Configure::version(); ?>"><?php echo __d('cake_dev', 'Read the changelog'); ?> </a>
+<p>
+	<a href="http://cakephp.org/changelogs/<?php echo Configure::version(); ?>"><?php echo __d('cake_dev', 'Read the changelog'); ?> </a>
+</p>
 <?php
 if (Configure::read('debug') > 0):
 	Debugger::checkSecurityKeys();

lib/Cake/Console/Templates/skel/webroot/index.php

@@ -58,6 +58,9 @@ if (!defined('APP_DIR')) {
  * cannot modify your include_path set this value.
  *
  * Leaving this constant undefined will result in it being defined in Cake/bootstrap.php
+ *
+ * The following line differs from its sibling
+ * /app/webroot/index.php
  */
 //define('CAKE_CORE_INCLUDE_PATH', __CAKE_PATH__);
 
@@ -85,11 +88,11 @@ if (!defined('CAKE_CORE_INCLUDE_PATH')) {
 	if (function_exists('ini_set')) {
 		ini_set('include_path', ROOT . DS . 'lib' . PATH_SEPARATOR . ini_get('include_path'));
 	}
-	if (!include 'Cake' . DS . 'bootstrap.php') {
+	if (!include('Cake' . DS . 'bootstrap.php')) {
 		$failed = true;
 	}
 } else {
-	if (!include CAKE_CORE_INCLUDE_PATH . DS . 'Cake' . DS . 'bootstrap.php') {
+	if (!include(CAKE_CORE_INCLUDE_PATH . DS . 'Cake' . DS . 'bootstrap.php')) {
 		$failed = true;
 	}
 }

lib/Cake/Console/Templates/skel/webroot/test.php

@@ -55,6 +55,9 @@ if (!defined('APP_DIR')) {
  * need to cannot modify your include_path, you can set this path.
  *
  * Leaving this constant undefined will result in it being defined in Cake/bootstrap.php
+ *
+ * The following line differs from its sibling
+ * /app/webroot/test.php
  */
 //define('CAKE_CORE_INCLUDE_PATH', __CAKE_PATH__);
 
@@ -74,11 +77,11 @@ if (!defined('CAKE_CORE_INCLUDE_PATH')) {
 	if (function_exists('ini_set')) {
 		ini_set('include_path', ROOT . DS . 'lib' . PATH_SEPARATOR . ini_get('include_path'));
 	}
-	if (!include 'Cake' . DS . 'bootstrap.php') {
+	if (!include('Cake' . DS . 'bootstrap.php')) {
 		$failed = true;
 	}
 } else {
-	if (!include CAKE_CORE_INCLUDE_PATH . DS . 'Cake' . DS . 'bootstrap.php') {
+	if (!include(CAKE_CORE_INCLUDE_PATH . DS . 'Cake' . DS . 'bootstrap.php')) {
 		$failed = true;
 	}
 }
@@ -87,7 +90,7 @@ if (!empty($failed)) {
 }
 
 if (Configure::read('debug') < 1) {
-	exit(__d('cake_dev', 'Debug setting does not allow access to this url.'));
+	die(__d('cake_dev', 'Debug setting does not allow access to this url.'));
 }
 
 require_once CAKE . 'TestSuite' . DS . 'CakeTestSuiteDispatcher.php';