Merge branch 'PHP-7.4'

* PHP-7.4:
  [ci skip] Fix CS in Markdown files

diff --cc docs/unix-build-system.md
index 9a6716cb21b06115899554d0335d20c4bdcccdbc,bdb8d4d146d5f8191bee32efcc91b93d0e3635fc..8e18207ab2667876e857332f9fa9bf344f17ef01
--- 1/docs/unix-build-system.md
--- 2/docs/unix-build-system.md
+++ b/docs/unix-build-system.md
@@@ -100,7 -107,9 +107,9 @@@ regarding how PHP is supposed to be bui
  
  For example for APXS:
  
 -PHP_SELECT_SAPI(apache, shared, sapi_apache.c mod_php7.c php_apache.c)
+ ```m4
 +PHP_SELECT_SAPI(apache, shared, sapi_apache.c mod_php.c php_apache.c)
+ ```
  
  ## General info