summaryrefslogtreecommitdiffstats
path: root/user_guide_src/source/libraries
diff options
context:
space:
mode:
authorJoffrey Jaffeux <j.jaffeux@gmail.com>2012-06-06 16:59:04 +0200
committerJoffrey Jaffeux <j.jaffeux@gmail.com>2012-06-06 16:59:04 +0200
commitd284360a52691cd1f3a83ff51b498725146f81c7 (patch)
treec5ef6a1e9f9284d1447aef5090bb7a4b6b4054a1 /user_guide_src/source/libraries
parent908f36a583384b0314d04c4cfe71992746e35daa (diff)
parent47b673324f06236264ca64f8c3155aab51762609 (diff)
Merge https://github.com/EllisLab/CodeIgniter into valid-ipv6
Conflicts: user_guide_src/source/changelog.rst
Diffstat (limited to 'user_guide_src/source/libraries')
-rw-r--r--user_guide_src/source/libraries/output.rst4
1 files changed, 4 insertions, 0 deletions
diff --git a/user_guide_src/source/libraries/output.rst b/user_guide_src/source/libraries/output.rst
index baceaae7b..0472d14cf 100644
--- a/user_guide_src/source/libraries/output.rst
+++ b/user_guide_src/source/libraries/output.rst
@@ -49,6 +49,10 @@ data, JPEG's, XML, etc easily.
.. important:: Make sure any non-mime string you pass to this method
exists in config/mimes.php or it will have no effect.
+You can also set the character set of the document, by passing a second argument::
+
+ $this->output->set_content_type('css', 'utf-8');
+
$this->output->get_content_type();
==========================================