summaryrefslogtreecommitdiffstats
path: root/user_guide_src/source/libraries/email.rst
diff options
context:
space:
mode:
authorDavid Barratt <david@davidwbarratt.com>2013-02-18 23:57:51 +0100
committerDavid Barratt <david@davidwbarratt.com>2013-02-18 23:57:51 +0100
commita0afc3aafad9552d5f8763fdc6f635b5b683d8b6 (patch)
tree3fe2b8717a2057564ebdb331e89edc8ba4445259 /user_guide_src/source/libraries/email.rst
parentb2834114746585b60a490992a02c1b136363e791 (diff)
parent6244086d6e251fc4b3c71d23da625ffb59b85d77 (diff)
Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop
Diffstat (limited to 'user_guide_src/source/libraries/email.rst')
-rw-r--r--user_guide_src/source/libraries/email.rst1
1 files changed, 1 insertions, 0 deletions
diff --git a/user_guide_src/source/libraries/email.rst b/user_guide_src/source/libraries/email.rst
index 7d468251c..a55f1895d 100644
--- a/user_guide_src/source/libraries/email.rst
+++ b/user_guide_src/source/libraries/email.rst
@@ -89,6 +89,7 @@ Preference Default Value Options Descript
**smtp_pass** No Default None SMTP Password.
**smtp_port** 25 None SMTP Port.
**smtp_timeout** 5 None SMTP Timeout (in seconds).
+**smtp_keepalive** FALSE TRUE or FALSE (boolean) Enable persistent SMTP connections.
**smtp_crypto** No Default tls or ssl SMTP Encryption
**wordwrap** TRUE TRUE or FALSE (boolean) Enable word-wrap.
**wrapchars** 76 Character count to wrap at.