Merge branch 'master' into release/next

README.md

@@ -368,7 +368,7 @@ It is recommended to keep your root docker config files in one repository, and y
 - `bin/test/unit-coverage`: Generate unit tests coverage reports, saved to the folder `dev/tests/unit/report`. Ex. `bin/test/unit-coverage my-dir`
 - `bin/test/unit-xdebug`: Run unit tests with Xdebug. Ex. `bin/test/unit-xdebug my-dir`
 - `bin/update`: Update your project to the most recent version of `docker-magento`.
-- `bin/xdebug`: Disable or enable Xdebug. Accepts argument `disable`, `enable`, or `status`. Ex. `bin/xdebug enable`
+- `bin/xdebug`: Set a custom xdebug.mode (Ex. `bin/xdebug debug`) or check the current status and get all available modes (Ex. `bin/xdebug`)
 
 ## Misc Info
 

compose/Makefile

@@ -84,7 +84,7 @@ help:
 	@echo "$(call format,stopall,'Stop all docker running containers.')"
 	@echo "$(call format,test,'Run unit tests for a specific path.')"
 	@echo "$(call format,update,'Update your project to the latest version of docker-magento.')"
-	@echo "$(call format,xdebug,'Disable or enable Xdebug. Accepts argument `disable`, `enable`, or `status`.')"
+	@echo "$(call format,xdebug,'Set a custom xdebug.mode, or check the current status and get all available modes . Accepts optional argument of mode `off`, `debug`, etc.')"
 
 
 analyse: