Skip to content

Commit cdd7702

Browse files
committed
Merge branch '4.4' into 5.0
* 4.4: [Mailer] Removed mention of Let's Encrypt for S/MIME certificates Remove deprecation notice block for tagged #12661 Remove outdated service
2 parents d5c1688 + a3983f5 commit cdd7702

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed

mailer.rst

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -547,7 +547,7 @@ encrypt a signed message and/or to sign an encrypted message.
547547
Before signing/encrypting messages, make sure to have:
548548

549549
* The `OpenSSL PHP extension`_ properly installed and configured;
550-
* A valid security certificate (you can get it for free from `Let's Encrypt project`_).
550+
* A valid S/MIME security certificate.
551551

552552
Signing Messages
553553
~~~~~~~~~~~~~~~~
@@ -763,5 +763,4 @@ environment:
763763
.. _`Inky`: https://foundation.zurb.com/emails.html
764764
.. _`S/MIME`: https://en.wikipedia.org/wiki/S/MIME
765765
.. _`OpenSSL PHP extension`: https://php.net/manual/en/book.openssl.php
766-
.. _`Let's Encrypt project`: https://letsencrypt.org/
767766
.. _`PEM encoded`: https://en.wikipedia.org/wiki/Privacy-Enhanced_Mail

security/user_provider.rst

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -467,9 +467,8 @@ Symfony defines several services related to user providers:
467467
468468
Select one of the following services to display its information:
469469
[0] security.user.provider.in_memory
470-
[1] security.user.provider.in_memory.user
471-
[2] security.user.provider.ldap
472-
[3] security.user.provider.chain
470+
[1] security.user.provider.ldap
471+
[2] security.user.provider.chain
473472
...
474473
475474
Most of these services are abstract and cannot be injected in your services.

0 commit comments

Comments
 (0)