From c095d6e6ac2e74a0234e6be31945b9332381f1eb Mon Sep 17 00:00:00 2001 From: Kevin Ji Date: Mon, 15 Sep 2014 01:53:27 -0700 Subject: [PATCH 1/3] Windows Setup: Use English WAMP link --- _posts/01-05-01-Windows-Setup.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_posts/01-05-01-Windows-Setup.md b/_posts/01-05-01-Windows-Setup.md index f37e75d..6094516 100644 --- a/_posts/01-05-01-Windows-Setup.md +++ b/_posts/01-05-01-Windows-Setup.md @@ -24,5 +24,5 @@ PHP. [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/ +[wamp]: http://www.wampserver.com/en/ [php-iis]: http://php.iis.net/ From ecdb28562e6a8912f5e045f046deaf60f271a89f Mon Sep 17 00:00:00 2001 From: Kevin Ji Date: Mon, 15 Sep 2014 01:57:29 -0700 Subject: [PATCH 2/3] Mac Setup: Adjust MAMP link --- _posts/01-04-01-Mac-Setup.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_posts/01-04-01-Mac-Setup.md b/_posts/01-04-01-Mac-Setup.md index bcdbb9e..5b2099b 100644 --- a/_posts/01-04-01-Mac-Setup.md +++ b/_posts/01-04-01-Mac-Setup.md @@ -20,6 +20,6 @@ For a complete "all-in-one" package that includes PHP, Apache web server and MyS [mac-compile]: http://www.php.net/manual/en/install.macosx.compile.php [xcode-gcc-substitution]: https://github.com/kennethreitz/osx-gcc-installer [apple-developer]: https://developer.apple.com/downloads -[mamp-downloads]: http://www.mamp.info/en/downloads/index.html +[mamp-downloads]: http://www.mamp.info/en/downloads/ [php-osx-downloads]: http://php-osx.liip.ch/ [xampp]: http://www.apachefriends.org/en/xampp.html From be36a5d6c16b9283965959b19fbf41ad695a543d Mon Sep 17 00:00:00 2001 From: Kevin Ji Date: Mon, 15 Sep 2014 01:58:28 -0700 Subject: [PATCH 3/3] Mac Setup: Adjust spelling of "OS X" --- _posts/01-04-01-Mac-Setup.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_posts/01-04-01-Mac-Setup.md b/_posts/01-04-01-Mac-Setup.md index 5b2099b..8c772cd 100644 --- a/_posts/01-04-01-Mac-Setup.md +++ b/_posts/01-04-01-Mac-Setup.md @@ -5,10 +5,10 @@ anchor: mac_setup ## Mac Setup {#mac_setup_title} -OSX comes prepackaged with PHP but it is normally a little behind the latest stable. Lion comes with PHP 5.3.6, +OS X comes prepackaged with PHP but it is normally a little behind the latest stable. Lion comes with PHP 5.3.6, Mountain Lion has 5.3.10, and Mavericks has 5.4.17. -To update PHP on OSX you can get it installed through a number of Mac [package managers][mac-package-managers], with +To update PHP on OS X you can get it installed through a number of Mac [package managers][mac-package-managers], with [php-osx by Liip][php-osx-downloads] being recommended. You can also [compile it yourself][mac-compile]; if you do, be sure to have installed either Xcode or