Merge branch '6.1' into 6.2

* 6.1:
  [HttpCache] Update a link to Varnish cookie docs
  Improve the explanation of the setfacl command usage
  [Notifier] Mention the "test" option of SmsApi

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

notifier.rst

@@ -87,7 +87,7 @@ Sendberry        ``symfony/sendberry-notifier``         ``sendberry://USERNAME:P
 Sendinblue       ``symfony/sendinblue-notifier``        ``sendinblue://API_KEY@default?sender=PHONE``
 Sms77            ``symfony/sms77-notifier``             ``sms77://API_KEY@default?from=FROM``
 Sinch            ``symfony/sinch-notifier``             ``sinch://ACCOUNT_ID:AUTH_TOKEN@default?from=FROM``
-Smsapi           ``symfony/smsapi-notifier``            ``smsapi://TOKEN@default?from=FROM``
+Smsapi           ``symfony/smsapi-notifier``            ``smsapi://TOKEN@default?from=FROM&test=0``
 SmsBiuras        ``symfony/sms-biuras-notifier``        ``smsbiuras://UID:API_KEY@default?from=FROM&test_mode=0``
 Smsc             ``symfony/smsc-notifier``              ``smsc://LOGIN:PASSWORD@default?from=FROM``
 SMSFactor        ``symfony/sms-factor-notifier``        ``sms-factor://TOKEN@default?sender=SENDER&push_type=PUSH_TYPE``
@@ -99,14 +99,15 @@ Vonage           ``symfony/vonage-notifier``            ``vonage://KEY:SECRET@de
 Yunpian          ``symfony/yunpian-notifier``           ``yunpian://APIKEY@default``
 ===============  =====================================  ===========================================================================
 
-.. versionadded:: 6.2
-
-    The ContactEveryone and SMSFactor integrations were introduced in Symfony 6.2.
-
 .. versionadded:: 6.1
 
     The 46elks, OrangeSms, KazInfoTeh and Sendberry integrations were introduced in Symfony 6.1.
     The ``no_stop_clause`` option in ``OvhCloud`` DSN was introduced in Symfony 6.1.
+    The ``test`` option in ``Smsapi`` DSN was introduced in Symfony 6.1.
+
+.. versionadded:: 6.2
+
+    The ContactEveryone and SMSFactor integrations were introduced in Symfony 6.2.
 
 To enable a texter, add the correct DSN in your ``.env`` file and
 configure the ``texter_transports``:

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