From 002b147b232c3ba77f45ae74d2cb480aae76eb93 Mon Sep 17 00:00:00 2001 From: Bo-Yi Wu Date: Tue, 23 Aug 2016 16:56:14 +0800 Subject: [PATCH 1/2] update readme for phpMyAdmin. Signed-off-by: Bo-Yi Wu --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index b466c9fe..87b2cc7b 100644 --- a/README.md +++ b/README.md @@ -126,6 +126,7 @@ Let's see how easy it is to install `NGINX`, `PHP`, `Composer`, `MySQL` and `Red - Beanstalkd (+ Beanstalkd Console) - **Tools:** - Workspace (PHP7-CLI, Composer, Git, Node, Gulp, SQLite, Vim, Nano, cURL...) + - phpMyAdmin >If you can't find your Software, build it yourself and add it to this list. Contributions are welcomed :) @@ -243,7 +244,7 @@ docker-compose up -d nginx mysql You can select your own combination of Containers form the list below: -`nginx`, `hhvm`, `php-fpm`, `mysql`, `redis`, `postgres`, `mariadb`, `neo4j`, `mongo`, `apache2`, `caddy`, `memcached`, `beanstalkd`, `beanstalkd-console`, `workspace`. +`nginx`, `hhvm`, `php-fpm`, `mysql`, `redis`, `postgres`, `mariadb`, `neo4j`, `mongo`, `apache2`, `caddy`, `memcached`, `beanstalkd`, `beanstalkd-console`, `workspace`, `phpmyadmin`. **Note**: `workspace` and `php-fpm` will run automatically in most of the cases, so no need to specify them in the `up` command. From c68f70d2a797fa7e2cd59fd0eec9fd56cb871dad Mon Sep 17 00:00:00 2001 From: Bo-Yi Wu Date: Tue, 23 Aug 2016 16:53:30 +0800 Subject: [PATCH 2/2] fix typo Signed-off-by: Bo-Yi Wu --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 87b2cc7b..3ac1efc3 100644 --- a/README.md +++ b/README.md @@ -188,7 +188,7 @@ What's better than a **Demo Video**: ## Requirements -- [Git](https://git-scm.com/downloads) +- [Git](https://git-scm.com/downloads) - [Docker](https://www.docker.com/products/docker/) @@ -493,7 +493,7 @@ Example using Composer composer create-project laravel/laravel my-cool-app "5.2.*" ``` -> We recommand using `composer create-project` instead of the Laravel installer, to install Laravel. +> We recommend using `composer create-project` instead of the Laravel installer, to install Laravel. For more about the Laravel installation click [here](https://laravel.com/docs/master#installing-laravel).