Commit b99bf4ba authored by Fabien Potencier's avatar Fabien Potencier

Merge branch '1.2' into 1.3

* 1.2:
  add values to parameters copied from symfony docs
parents 244dbef7 a9dbda03
...@@ -21,8 +21,8 @@ Parameters ...@@ -21,8 +21,8 @@ Parameters
* **port**: SMTP port, defaults to 25. * **port**: SMTP port, defaults to 25.
* **username**: SMTP username, defaults to an empty string. * **username**: SMTP username, defaults to an empty string.
* **password**: SMTP password, defaults to an empty string. * **password**: SMTP password, defaults to an empty string.
* **encryption**: SMTP encryption, defaults to null. * **encryption**: SMTP encryption, defaults to null. Valid values are 'tls', 'ssl', or null (indicating no encryption).
* **auth_mode**: SMTP authentication mode, defaults to null. * **auth_mode**: SMTP authentication mode, defaults to null. Valid values are 'plain', 'login', 'cram-md5', or null.
Example usage:: Example usage::
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment