diff options
author | Derek Jones <derek.jones@ellislab.com> | 2012-06-27 05:53:34 +0200 |
---|---|---|
committer | Derek Jones <derek.jones@ellislab.com> | 2012-06-27 05:53:34 +0200 |
commit | 2a3f51286a872ec563b191da5b8fbb7cbd392191 (patch) | |
tree | e316f2c03924f557e2e1c9917d1da5dd3b9289e3 /user_guide_src/source/libraries | |
parent | 2fce2a95e99c91c57f7d15b5e441b2cf89193da3 (diff) | |
parent | d13803813b355fccb17dd4f148f43b7a20977781 (diff) |
Merge branch 'feature/toc-repair' into develop
Diffstat (limited to 'user_guide_src/source/libraries')
-rw-r--r-- | user_guide_src/source/libraries/email.rst | 2 | ||||
-rw-r--r-- | user_guide_src/source/libraries/pagination.rst | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/user_guide_src/source/libraries/email.rst b/user_guide_src/source/libraries/email.rst index f99eb91df..c5fa68004 100644 --- a/user_guide_src/source/libraries/email.rst +++ b/user_guide_src/source/libraries/email.rst @@ -183,7 +183,7 @@ accept HTML email. If you do not set your own message CodeIgniter will extract the message from your HTML email and strip the tags. $this->email->set_header() ------------------------ +-------------------------- Appends additional headers to the e-mail:: diff --git a/user_guide_src/source/libraries/pagination.rst b/user_guide_src/source/libraries/pagination.rst index 6e1020be3..7d750bd23 100644 --- a/user_guide_src/source/libraries/pagination.rst +++ b/user_guide_src/source/libraries/pagination.rst @@ -113,7 +113,7 @@ Note that "per_page" is the default query string passed, however can be configured using $config['query_string_segment'] = 'your_string' $config['reuse_query_string'] = FALSE; -==================================== +====================================== By default your Query String arguments (nothing to do with other query string options) will be ignored. Setting this config to |