ivo/ponzi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'hotfix/fix_markdown' into staging

Browse Source 
Conflicts:
	laravel/documentation/install.md
This commit is contained in:
Shawn McCool
2012-07-11 22:35:24 +02:00
parent 66f9ea8dba a6c28050e6
commit 79edd529e8
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
laravel/documentation/install.md
View File

@@ -23,7 +23,8 @@
1. [Download Laravel](http://laravel.com/download) 1. [Download Laravel](http://laravel.com/download)
2. Extract the Laravel archive and upload the contents to your web server. 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. 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! If all is well, you should see a pretty Laravel splash page. Get ready, there is lots more to learn!
@@ -56,9 +57,9 @@ A very basic example of an Apache VirtualHost configuration for MySite might loo
ServerName mysite.dev ServerName mysite.dev
</VirtualHost> </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.) 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> <a name="basic-configuration"></a>
## Basic Configuration ## Basic Configuration

2
laravel/documentation/localization.md
View File

@@ -33,7 +33,7 @@ Next, you should create a corresponding **marketing.php** file within the **appl
Nice! Now you know how to get started setting up your language files and directories. Let's keep localizing! 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
#### Retrieving a language line: #### Retrieving a language line:

2
laravel/input.php
View File

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