summaryrefslogtreecommitdiffstats
path: root/user_guide/libraries
diff options
context:
space:
mode:
authorTimothy Warren <tim@timshomepage.net>2011-10-03 16:05:42 +0200
committerTimothy Warren <tim@timshomepage.net>2011-10-03 16:05:42 +0200
commit3fdb613ee7c1968435edb81dcb9a59f42be6de6e (patch)
treedeb8ebc7a7ea1dabcdbfc284bae2f300d7d6a902 /user_guide/libraries
parenta0cd41c5187c738d043ca5a0dc5fbf80806fd322 (diff)
parent51a7b75ba023a4bf1e70840a19e0457f5123fb72 (diff)
Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into develop
Diffstat (limited to 'user_guide/libraries')
-rw-r--r--user_guide/libraries/email.html5
1 files changed, 4 insertions, 1 deletions
diff --git a/user_guide/libraries/email.html b/user_guide/libraries/email.html
index d246254ab..de2f1c0c9 100644
--- a/user_guide/libraries/email.html
+++ b/user_guide/libraries/email.html
@@ -63,6 +63,7 @@ Email Class
<ul>
<li>Multiple Protocols: Mail, Sendmail, and SMTP</li>
+<li>TLS and SSL Encryption for SMTP</li>
<li>Multiple recipients</li>
<li>CC and BCCs</li>
<li>HTML or Plaintext email</li>
@@ -152,6 +153,8 @@ will NOT need to use the <dfn>$this->email->initialize()</dfn> function if you s
</tr><tr>
<td class="td"><strong>smtp_timeout</strong></td><td class="td">5</td><td class="td">None</td><td class="td">SMTP Timeout (in seconds).</td>
</tr><tr>
+<td class="td"><strong>smtp_crypto</strong></td><td class="td">No Default</td><td class="td">tls or ssl</td><td class="td">SMTP Encryption.</td>
+</tr><tr>
<td class="td"><strong>wordwrap</strong></td><td class="td">TRUE</td><td class="td">TRUE or FALSE (boolean)</td><td class="td">Enable word-wrap.</td>
</tr><tr>
<td class="td"><strong>wrapchars</strong></td><td class="td">76</td><td class="td"> </td><td class="td">Character count to wrap at.</td>
@@ -304,4 +307,4 @@ Next Topic:&nbsp;&nbsp;<a href="encryption.html">Encryption Class</a>
</div>
</body>
-</html> \ No newline at end of file
+</html>