Merge branch '6.3' into 6.4

* 6.3:
  Add Caddy section
  Clean-up Apache and Nginx parts
  modernize the web server configuration chapter

Author: javiereguiluz