MERGE: Merge branch '5.4' into master

Configuration/Settings.yaml

@@ -6,13 +6,15 @@ Neos:
       options: []
 
 # Example settings for sending emails via SMTP / SSL:
+# Encryption can be set to either tls or ssl
 #
 # SwiftMailer:
 #   transport:
 #     type: 'Swift_SmtpTransport'
 #     options:
 #       host: 'smtp.example.com'
 #       port: 465
+#       encryption: 'ssl'
 #       username: 'myaccount@example.com'
 #       password: '5js9j1lkjs8'
 #       localDomain: 'example.com'

Documentation/index.rst

@@ -28,10 +28,13 @@ function. To use SMTP for sending, follow the following example:
         options:
           host: 'smtp.example.com'
           port: '465'
+          encryption: 'ssl'
           username: 'myaccount@example.com'
           password: 'shoobidoo'
           localDomain: 'example.com'
 
+The encryption property supports values ``ssl`` and ``tls``.
+
 Further transports are available with Swift Mailer and can be used as well. Their options can
 be looked up the Swift Mailer documentation and they can be set by extrapolating from their
 setter method names (as in: ``setUsername()`` becomes ``username`` in the options.)

composer.json

@@ -47,4 +47,4 @@
             "Neos.Flow-20161125124112"
         ]
     }
-}
+}