Merge branch 'develop' of github.com:laravel/laravel into develop

daylerees · daylerees · commit 9ea50183727d · 2012-07-31T14:37:07.000+01:00
diff --git a/laravel/documentation/controllers.md b/laravel/documentation/controllers.md
@@ -49,7 +49,7 @@ Check [the routing page](/docs/routing#controller-routing) for more information
 <a name="bundle-controllers"></a>
 ## Bundle Controllers
 
-Bundles are Laravel's modular package system. Bundles can easily configured to handle requests to your application. We'll be going over [bundles in more detail](/docs/bundles) in another document.
+Bundles are Laravel's modular package system. Bundles can be easily configured to handle requests to your application. We'll be going over [bundles in more detail](/docs/bundles) in another document.
 
 Creating controllers that belong to bundles is almost identical to creating your application controllers. Just prefix the controller class name with the name of the bundle, so if your bundle is named "admin", your controller classes would look like this:
 
diff --git a/laravel/helpers.php b/laravel/helpers.php
@@ -34,7 +34,10 @@ function __($key, $replacements = array(), $language = null)
  */
 function dd($value)
 {
-	die(var_dump($value));
+	echo "<pre>";
+	var_dump($value);
+	echo "</pre>";
+	die;
 }
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,10 @@ function __($key, $replacements = array(), $language = null)`
`34`	`34`	`*/`
`35`	`35`	`function dd($value)`
`36`	`36`	`{`
`37`		`- die(var_dump($value));`
	`37`	`+ echo "<pre>";`
	`38`	`+ var_dump($value);`
	`39`	`+ echo "</pre>";`
	`40`	`+ die;`
`38`	`41`	`}`
`39`	`42`
`40`	`43`	`/**`