From bb34ffc77f2c1bfa6bf80297f0c20baaf1131115 Mon Sep 17 00:00:00 2001 From: phpdistiller Date: Sun, 30 Mar 2014 19:03:16 +0800 Subject: [PATCH 1/8] EasyPHP added EasyPHP is the oldest PHP package for Windows, and is more "up-to-date" than Wamp. It comes with a lot more features for developers: modules, components... --- _posts/01-05-01-Windows-Setup.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/_posts/01-05-01-Windows-Setup.md b/_posts/01-05-01-Windows-Setup.md index cced0ae..f37e75d 100644 --- a/_posts/01-05-01-Windows-Setup.md +++ b/_posts/01-05-01-Windows-Setup.md @@ -10,7 +10,7 @@ installer. The installer is no longer supported and stops at PHP 5.3.0. For learning and local development you can use the built in webserver with PHP 5.4+ so you don't need to worry about configuring it. If you would like an "all-in-one" which includes a full-blown webserver and MySQL too then tools such as the [Web Platform Installer][wpi], -[Zend Server CE][zsce], [XAMPP][xampp] and [WAMP][wamp] will help get a Windows development environment up and running fast. That said, these tools will be +[Zend Server CE][zsce], [XAMPP][xampp], [EasyPHP][easyphp] and [WAMP][wamp] will help get a Windows development environment up and running fast. That said, these tools will be a little different from production so be careful of environment differences if you are working on Windows and deploying to Linux. If you need to run your production system on Windows then IIS7 will give you the most stable and best performance. You can use @@ -23,5 +23,6 @@ PHP. [wpi]: http://www.microsoft.com/web/downloads/platform.aspx [zsce]: http://www.zend.com/en/products/server-ce/ [xampp]: http://www.apachefriends.org/en/xampp.html +[easyphp]: http://www.easyphp.org/ [wamp]: http://www.wampserver.com/ [php-iis]: http://php.iis.net/ From a6e2350f5d17cbf7e4e04ca35e31d2b30182fe55 Mon Sep 17 00:00:00 2001 From: Tom Houdmont Date: Wed, 16 Apr 2014 11:32:21 +0100 Subject: [PATCH 2/8] Spelling mistake in Books section corrected --- _posts/13-04-01-Books.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_posts/13-04-01-Books.md b/_posts/13-04-01-Books.md index 0bd5558..372dd86 100644 --- a/_posts/13-04-01-Books.md +++ b/_posts/13-04-01-Books.md @@ -7,7 +7,7 @@ anchor: books There are a lot of books around for PHP but some are sadly now quite old and no longer contain accurate information. There are even books published for "PHP 6" -which does not exist, any might not now ever exist because of those books. +which does not exist, and might not now ever exist because of those books. This section aims to be a living document for recommended books on PHP development in general. If you would like your book to be added, send a PR and From 8fca7e1f51cc37de5576eea51a7666d37c954a91 Mon Sep 17 00:00:00 2001 From: Josh Date: Wed, 23 Apr 2014 22:48:59 -0700 Subject: [PATCH 3/8] change a few words --- _posts/01-06-01-Vagrant.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_posts/01-06-01-Vagrant.md b/_posts/01-06-01-Vagrant.md index b1b3a01..274561d 100644 --- a/_posts/01-06-01-Vagrant.md +++ b/_posts/01-06-01-Vagrant.md @@ -10,14 +10,14 @@ popping up when you go live. It's also tricky to keep different development envi version for all libraries used when working with a team of developers. If you are developing on Windows and deploying to Linux (or anything non-Windows) or are developing in a team, you -should consider using a virtual machine. This sounds tricky, but using [Vagrant][vagrant] you can set up a simple +should consider using a virtual machine. This sounds tricky, but by using [Vagrant][vagrant] you can set up a simple virtual machine with only a few steps. These base boxes can then be set up manually, or you can use "provisioning" software such as [Puppet][puppet] or [Chef][chef] to do this for you. Provisioning the base box is a great way to ensure that multiple boxes are set up in an identical fashion and removes the need for you to maintain complicated "set up" command lists. You can also "destroy" your base box and recreate it without many manual steps, making it easy to create a "fresh" installation. -Vagrant creates shared folders used to share your code between your host and your virtual machine, meaning you can +Vagrant creates folders for sharing your code between your host and your virtual machine, which means that you can create and edit your files on your host machine and then run the code inside your virtual machine. ### A little help From d0292a994ac2e9e4a75bb2531c8234ef504ece38 Mon Sep 17 00:00:00 2001 From: Josh Date: Wed, 23 Apr 2014 23:04:22 -0700 Subject: [PATCH 4/8] new commit --- _posts/01-06-01-Vagrant.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_posts/01-06-01-Vagrant.md b/_posts/01-06-01-Vagrant.md index 274561d..53fe397 100644 --- a/_posts/01-06-01-Vagrant.md +++ b/_posts/01-06-01-Vagrant.md @@ -24,7 +24,7 @@ create and edit your files on your host machine and then run the code inside you If you need a little help to start using Vagrant there are three services that might be useful: -- [Rove][rove]: service that allows you to pregenerate typical Vagrant builds, PHP among the options. The +- [Rove][rove]: service that allows you to pre-generate typical Vagrant builds, PHP among the options. The provisioning is made with Chef. - [Puphpet][puphpet]: simple GUI to set up virtual machines for PHP development. **Heavily focused in PHP**. Besides local VMs, can be used to deploy to cloud services as well. The provisioning is made with Puppet. From c6fc0272351cbd94b7aa8c7a69bcb930e9e2c93c Mon Sep 17 00:00:00 2001 From: Josh Lockhart Date: Fri, 2 May 2014 10:53:12 -0400 Subject: [PATCH 5/8] Add French translation link --- _includes/welcome.md | 1 + 1 file changed, 1 insertion(+) diff --git a/_includes/welcome.md b/_includes/welcome.md index ac614fd..d524409 100644 --- a/_includes/welcome.md +++ b/_includes/welcome.md @@ -22,6 +22,7 @@ _PHP: The Right Way_ is (or soon will be) translated into many different languag * [English](http://www.phptherightway.com) * [Chinese (Simplified)](http://wulijun.github.com/php-the-right-way) +* [French](http://eilgin.github.io/php-the-right-way/) * [Japanese](http://ja.phptherightway.com) * [Korean](http://wafe.github.io/php-the-right-way/) * [Italian](http://it.phptherightway.com/) From 8065ebada1ea7a5d46213d47e1e18786395cebb5 Mon Sep 17 00:00:00 2001 From: Josh Lockhart Date: Fri, 2 May 2014 11:00:16 -0400 Subject: [PATCH 6/8] Add Thai translation link --- _includes/welcome.md | 1 + 1 file changed, 1 insertion(+) diff --git a/_includes/welcome.md b/_includes/welcome.md index d524409..a58a201 100644 --- a/_includes/welcome.md +++ b/_includes/welcome.md @@ -33,6 +33,7 @@ _PHP: The Right Way_ is (or soon will be) translated into many different languag * [Ukrainian](http://iflista.github.com/php-the-right-way/) * [Bulgarian](http://bg.phptherightway.com/) * [German](http://rwetzlmayr.github.io/php-the-right-way/) +* [Thai](https://apzentral.github.io/php-the-right-way/) * [Turkish](http://hkulekci.github.io/php-the-right-way/) * [Slovenian](http://sl.phptherightway.com) From 26828b1e13785a8cb2320990e6ed18aa01a2d10e Mon Sep 17 00:00:00 2001 From: Josh Lockhart Date: Fri, 2 May 2014 11:07:35 -0400 Subject: [PATCH 7/8] Add Indonesian translation link --- _includes/welcome.md | 1 + 1 file changed, 1 insertion(+) diff --git a/_includes/welcome.md b/_includes/welcome.md index a58a201..fc2a72d 100644 --- a/_includes/welcome.md +++ b/_includes/welcome.md @@ -25,6 +25,7 @@ _PHP: The Right Way_ is (or soon will be) translated into many different languag * [French](http://eilgin.github.io/php-the-right-way/) * [Japanese](http://ja.phptherightway.com) * [Korean](http://wafe.github.io/php-the-right-way/) +* [Indonesian](http://id.phptherightway.com/) * [Italian](http://it.phptherightway.com/) * [Polish](http://pl.phptherightway.com/) * [Portuguese](http://br.phptherightway.com/) From a1ba588952316543691c1fff3e0a4b8c3e3c6891 Mon Sep 17 00:00:00 2001 From: Josh Lockhart Date: Fri, 2 May 2014 11:11:42 -0400 Subject: [PATCH 8/8] Add Romanian translation link --- _includes/welcome.md | 1 + 1 file changed, 1 insertion(+) diff --git a/_includes/welcome.md b/_includes/welcome.md index fc2a72d..dc71bea 100644 --- a/_includes/welcome.md +++ b/_includes/welcome.md @@ -29,6 +29,7 @@ _PHP: The Right Way_ is (or soon will be) translated into many different languag * [Italian](http://it.phptherightway.com/) * [Polish](http://pl.phptherightway.com/) * [Portuguese](http://br.phptherightway.com/) +* [Romanian](https://bgui.github.io/php-the-right-way/) * [Russian](http://getjump.github.io/ru-php-the-right-way) * [Spanish](http://phpdevenezuela.github.io/php-the-right-way/) * [Ukrainian](http://iflista.github.com/php-the-right-way/)