Browse files

Merge pull request #132 from thatcode/2.0

Minor comment and path changes.
  • Loading branch information...
2 parents a1f63a1 + fb3a192 commit 2725718231c4d8f084a06868e030319139c7b152 @markstory markstory committed Jul 1, 2011
View
2 lib/Cake/Console/Command/ConsoleShell.php
@@ -330,7 +330,7 @@ protected function _isValidModel($modelToCheck) {
}
/**
- * Reloads the routes configuration from config/routes.php, and compiles
+ * Reloads the routes configuration from app/Config/routes.php, and compiles
* all routes found
*
* @return boolean True if config reload was a success, otherwise false
View
2 lib/Cake/Console/Templates/default/views/home.ctp
@@ -46,7 +46,7 @@ endif;
echo '<span class=\"notice\">';
echo __d('cake_dev', 'Your database configuration file is NOT present.');
echo '<br/>';
- echo __d('cake_dev', 'Rename Config/database.php.default to Config/database.php');
+ echo __d('cake_dev', 'Rename APP/Config/database.php.default to APP/Config/database.php');
echo '</span>';
endif;
?>
View
2 lib/Cake/Routing/Router.php
@@ -473,7 +473,7 @@ public static function prefixes() {
}
/**
- * Parses given URL string. Returns 'routing' parametets for that url.
+ * Parses given URL string. Returns 'routing' parameters for that url.
*
* @param string $url URL to be parsed
* @return array Parsed elements from URL
View
2 lib/Cake/View/Pages/home.ctp
@@ -71,7 +71,7 @@ endif;
echo '<span class="notice">';
echo __d('cake_dev', 'Your database configuration file is NOT present.');
echo '<br/>';
- echo __d('cake_dev', 'Rename Config/database.php.default to Config/database.php');
+ echo __d('cake_dev', 'Rename APP/Config/database.php.default to APP/Config/database.php');
echo '</span>';
endif;
?>

0 comments on commit 2725718

Please sign in to comment.