Merge branch 'develop' into staging

taylorotwell · taylorotwell · commit 62aa4f4681a0 · 2012-05-21T13:47:17.000-05:00
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1 @@
+* text=auto
diff --git a/.gitignore b/.gitignore
@@ -1 +1,37 @@
+# Numerous always-ignore extensions
+*.diff
+*.err
+*.orig
+*.log
+*.rej
+*.swo
+*.swp
+*.vi
+*~
+*.sass-cache
+
+# OS or Editor folders
 .DS_Store
+Thumbs.db
+.cache
+.project
+.settings
+.tmproj
+*.esproj
+nbproject
+
+# Dreamweaver added files
+_notes
+dwsync.xml
+
+# Komodo
+*.komodoproject
+.komodotools
+
+# Folders to ignore
+.hg
+.svn
+.CVS
+intermediate
+publish
+.idea
diff --git a/readme.md b/readme.md
@@ -19,29 +19,43 @@ Laravel is a clean and classy framework for PHP web development. Freeing you fro
 
 **Hello World:**
 
-	Route::get('/', function()
-	{
-		return "Hello World!":
-	});
+```php
+<?php
+
+Route::get('/', function()
+{
+	return "Hello World!":
+});
+```
 
 **Passing Data To Views:**
 
-	Route::get('user/(:num)', function($id)
-	{
-		$user = DB::table('users')->find($id);
+```php
+<?php
+
+Route::get('user/(:num)', function($id)
+{
+	$user = DB::table('users')->find($id);
 
-		return View::make('profile')->with('user', $user);
-	});
+	return View::make('profile')->with('user', $user);
+});
+```
 
 **Redirecting & Flashing Data To The Session:**
 
-	return Redirect::to('profile')->with('message', 'Welcome Back!');
+```php
+<?php
+
+return Redirect::to('profile')->with('message', 'Welcome Back!');
+```
 
 ### Contributing to Laravel
 
 Contributions are encouraged and welcome; however, please review the Developer Certificate of Origin in the "license.txt" file included in the repository. All commits must be signed off using the "-s" switch.
 
-	git commit -s -m "this commit will be signed off automatically!"
+```bash
+git commit -s -m "this commit will be signed off automatically!"
+```
 
 ### License
 
