Merge branch '6.4' into 7.1

* 6.4:
  Update web_server_configuration.rst: Adding syntax highlighting

Author: javiereguiluz

setup/web_server_configuration.rst

@@ -195,7 +195,7 @@ Caddy
 
 When using Caddy on the server, you can use a configuration like this:
 
-.. code-block:: text
+.. code-block:: nginx
 
     # /etc/caddy/Caddyfile
     example.com, www.example.com {