Merge branch 'hotfix/fix_markdown' into develop

Conflicts:
	laravel/documentation/install.md

laravel/documentation/install.md

@@ -23,7 +23,8 @@ ## Installation
 1. [Download Laravel](http://laravel.com/download)
 2. Extract the Laravel archive and upload the contents to your web server.
 3. Set the value of the **key** option in the **config/application.php** file to a random, 32 character string.
-4. Navigate to your application in a web browser.
+4. Verify that the `storage/views` directory is writable.
+5. Navigate to your application in a web browser.
 
 If all is well, you should see a pretty Laravel splash page. Get ready, there is lots more to learn!
 
@@ -41,6 +42,9 @@ ### Problems?
 - Make sure the **public** directory is the document root of your web server. (see: Server Configuration below)
 - If you are using mod_rewrite, set the **index** option in **application/config/application.php** to an empty string.
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> hotfix/fix_markdown
 - Verify that your storage folder and the folders within are writable by your web server.
 
 <a name="server-configuration"></a>
@@ -57,10 +61,9 @@ ## Server Configuration
 		ServerName mysite.dev
 	</VirtualHost>
 
-Notice that while we installed to **/Users/JonSnow/Sites/MySite** our DocumentRoot points to /Users/JonSnow/Sites/MySite/public**.
+Notice that while we installed to **/Users/JonSnow/Sites/MySite** our DocumentRoot points to **/Users/JonSnow/Sites/MySite/public**.
 
-While pointing the DocumentRoot to the public folder is a commonly used best-practice, it's possible that you may need to use Laravel on a host that does not allow you to update your DocumentRoot. A collection of algorithms to circumvent this need can be found [http://forums.laravel.com/viewtopic.php?id=1258](on the Laravel forums.)
->>>>>>> feature/docs-install
+While pointing the DocumentRoot to the public folder is a commonly used best-practice, it's possible that you may need to use Laravel on a host that does not allow you to update your DocumentRoot. A collection of algorithms to circumvent this need can be found [on the Laravel forums.](http://forums.laravel.com/viewtopic.php?id=1258)
 
 <a name="basic-configuration"></a>
 ## Basic Configuration

laravel/documentation/localization.md

@@ -33,7 +33,7 @@ #### Creating a language file:
 
 Nice! Now you know how to get started setting up your language files and directories. Let's keep localizing!
 
-<a name="basics"></a>
+<a name="get"></a>
 ## Retrieving A Language Line
 
 #### Retrieving a language line:

laravel/input.php

@@ -205,7 +205,7 @@ public static function file($key = null, $default = null)
 	 */
 	public static function has_file($key)
 	{
-		return ! is_null(static::file("{$key}.tmp_name"));
+		return strlen(static::file("{$key}.tmp_name", "")) > 0;
 	}
 
 	/**