Merge branch 'gh-pages' of github.com:codeguy/php-the-right-way into gh-pages

_includes/welcome.md

@@ -22,16 +22,20 @@ _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/)
+* [Indonesian](http://id.phptherightway.com/)
 * [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/)
 * [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)
 

_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/

_posts/01-06-01-Vagrant.md

@@ -10,21 +10,21 @@ 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
 
 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.

_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