summaryrefslogtreecommitdiffstats
path: root/user_guide_src
diff options
context:
space:
mode:
Diffstat (limited to 'user_guide_src')
-rw-r--r--user_guide_src/source/changelog.rst2
-rw-r--r--user_guide_src/source/libraries/email.rst6
2 files changed, 4 insertions, 4 deletions
diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 5b123b929..ff7229243 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -196,7 +196,7 @@ Release Date: Not Released
- Added dsn (delivery status notification) option.
- Renamed method _set_header() to set_header() and made it public to enable adding custom headers in the :doc:`Email Library <libraries/email>`.
- Successfully sent emails will automatically clear the parameters.
- - Added third parameter $return_path in method Email::from().
+ - Added a *return_path* parameter to the ``from()`` method.
- :doc:`Pagination Library <libraries/pagination>` changes include:
- Added support for the anchor "rel" attribute.
- Added support for setting custom attributes.
diff --git a/user_guide_src/source/libraries/email.rst b/user_guide_src/source/libraries/email.rst
index fc324ffc9..e7ed9f74c 100644
--- a/user_guide_src/source/libraries/email.rst
+++ b/user_guide_src/source/libraries/email.rst
@@ -117,12 +117,12 @@ Sets the email address and name of the person sending the email::
$this->email->from('you@example.com', 'Your Name');
-::
+You can also set a Return-Path, to help redirect undelivered mail::
$this->email->from('you@example.com', 'Your Name', 'returned_emails@example.com');
-Third parameter is redirect for undelivered emails (may not be configured with
-protocol 'smtp').
+.. note:: Return-Path can't be used if you've configured
+ 'smtp' as your protocol.
$this->email->reply_to()
-------------------------