News entry: the new definition format for PHP-DI 4
Fixes in news entry: the new definition format for PHP-DI 4
Fix typo
Merge pull request #145 from lkysow/patch-1

Fix typo
Merge remote-tracking branch 'origin/master' into 4.0

Conflicts:
	doc/container-configuration.md
	news/README.md
#147 Rewrote website using Couscous