Skip to content

Commit f30658a

Browse files
committed
Merge remote-tracking branch 'upstream/master'
2 parents 3c618a0 + d3f403a commit f30658a

File tree

6 files changed

+14
-8
lines changed

6 files changed

+14
-8
lines changed

_includes/welcome.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Welcome
22

3-
_Disclaimer: Majority of the assets, design and format of this site is borrowed (forked might be the more better term) from the original PHP : The Right Way site. The original contributors is given all the credits due to them._
3+
_Disclaimer: Majority of the assets, design and format of this site is borrowed (forked might be the more better term) from the original [PHP : The Right Way](http://www.phptherightway.com/) site. The [original contributors](https://github.com/codeguy/php-the-right-way/graphs/contributors) is given all the credits due to them._
44

55
This site serves as a guide for those who is using Laravel Framework by Taylor Otwell and its contributors. Laravel : The Right Way aims to put together all the resources and best practices in using the Laravel Framework.
66

@@ -21,7 +21,7 @@ Help make this website the best resource for new PHP programmers! [Contribute on
2121

2222
## Spread the Word!
2323

24-
_PHP: The Right Way_ has web banner images you can use on your website. Show your support, and let new PHP developers
24+
_Laravel: The Right Way_ has web banner images you can use on your website. Show your support, and let new PHP developers
2525
know where to find good information!
2626

2727
[See Banner Images][2]

_posts/01-03-01-Built-in-Web-Server.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ You might notice a server.php in the Laravel codes. The purpose of this is for y
1212
> php -S localhost:8000 server.php
1313
{% endhighlight %}
1414

15-
or simply
15+
or simply (note that the following **only** works for Laravel `v4.x`):
1616

1717
{% highlight console %}
1818
> php artisan serve
@@ -22,4 +22,4 @@ You can also specify optional parameters
2222

2323
{% highlight console %}
2424
> php artisan serve --port=8080 --host=local.dev
25-
{% endhighlight %}
25+
{% endhighlight %}

_posts/16-10-01-Books.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,6 @@ anchor: books
55

66
## Books {#books_title}
77

8-
8+
* [**Laravel from Apprentice to Artisan** by Taylor Otwell](https://leanpub.com/laravel-testing-decoded)
9+
* [**Laravel Testing Decoded** by Jeffrey Way](https://leanpub.com/laravel-testing-decoded)
910
* open for suggestions

_posts/17-01-01-Community.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,9 @@ anchor: community
44

55
# Community {#community_title}
66

7-
open for suggestions
7+
- [Twitter (@laravelphp)](https://twitter.com/laravelphp)
8+
- [Slack (#laravel)](http://larachat.co/)
9+
- [Reddit (/r/laravel)](https://reddit.com/r/laravel)
10+
- [News](https://laravel-news.com/)
11+
- [Laravel.io Forums](http://laravel.io/forum)
12+
- [Laracasts Forums](https://laracasts.com/discuss)

_posts/17-02-01-User-Groups.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ anchor: user_groups
55

66
## User Groups {#user_groups_title}
77

8-
open for suggestions
8+
- [Laravel Philippines](https://www.facebook.com/groups/laravelph/)

scripts/setup.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
dataType: 'jsonp',
1111
timeout: 3000,
1212
type: 'GET',
13-
url: 'https://api.github.com/repos/laraveltherightway/laraveltherightway/contributors?per_page=100'
13+
url: 'https://api.github.com/repos/laraveltherightway/laraveltherightway.github.io/contributors?per_page=100'
1414
}).done(function (data) {
1515
if ( data.data && data.data.length ) {
1616
var $ul = $('<ul></ul>'), dataLength = data.data.length;

0 commit comments

Comments
 (0)