Merge branch '6.0' into 6.1

* 6.0:
  [HttpCache] Update a link to Varnish cookie docs
  Improve the explanation of the setfacl command usage

Author: javiereguiluz

http_cache/varnish.rst

@@ -235,7 +235,7 @@ proxy before it has expired, it adds complexity to your caching setup.
 
 .. _`Varnish`: https://varnish-cache.org/
 .. _`Edge Architecture`: http://www.w3.org/TR/edge-arch
-.. _`clean the cookies header`: https://varnish-cache.org/trac/wiki/VCLExampleRemovingSomeCookies
+.. _`clean the cookies header`: https://varnish-cache.org/docs/7.0/reference/vmod_cookie.html
 .. _`Surrogate-Capability Header`: http://www.w3.org/TR/edge-arch
 .. _`cache invalidation`: https://tools.ietf.org/html/rfc2616#section-13.10
 .. _`FOSHttpCacheBundle`: https://foshttpcachebundle.readthedocs.io/en/latest/features/user-context.html

setup/file_permissions.rst

@@ -44,7 +44,8 @@ server user and grant the needed permissions:
 .. code-block:: terminal
 
     $ HTTPDUSER=$(ps axo user,comm | grep -E '[a]pache|[h]ttpd|[_]www|[w]ww-data|[n]ginx' | grep -v root | head -1 | cut -d\  -f1)
-    # if this doesn't work, try adding `-n` option
+
+    # if the following commands don't work, try adding `-n` option to `setfacl`
 
     # set permissions for future files and folders
     $ sudo setfacl -dR -m u:"$HTTPDUSER":rwX -m u:$(whoami):rwX var