diff options
author | dchill42 <dchill42@gmail.com> | 2012-10-21 01:39:40 +0200 |
---|---|---|
committer | dchill42 <dchill42@gmail.com> | 2012-10-21 01:39:40 +0200 |
commit | 9e4ebf1af81b0e5216a026fe4a99a19f2be6a831 (patch) | |
tree | 97ddddc6b7a65130672a168f522d7a69e515ec54 /user_guide_src/source/libraries | |
parent | e3621cc79fa4b4658768fea0694cc0ae52835d85 (diff) | |
parent | 8df1ae2d7e0fd441f7a1fc481c76c5c1edfadf23 (diff) |
Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into load_config_units
Diffstat (limited to 'user_guide_src/source/libraries')
-rw-r--r-- | user_guide_src/source/libraries/javascript.rst | 2 | ||||
-rw-r--r-- | user_guide_src/source/libraries/output.rst | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/user_guide_src/source/libraries/javascript.rst b/user_guide_src/source/libraries/javascript.rst index d5e09c314..393d4e321 100644 --- a/user_guide_src/source/libraries/javascript.rst +++ b/user_guide_src/source/libraries/javascript.rst @@ -192,7 +192,7 @@ and triggered by a click using the jQuery library's click() event. 'width' => '50%', 'marginLeft' => 125 ); - $this->jquery->click('#trigger', $this->jquery->animate('#note', $params, normal)); + $this->jquery->click('#trigger', $this->jquery->animate('#note', $params, 'normal')); fadeIn() / fadeOut() -------------------- diff --git a/user_guide_src/source/libraries/output.rst b/user_guide_src/source/libraries/output.rst index 3289a241f..2b72ba777 100644 --- a/user_guide_src/source/libraries/output.rst +++ b/user_guide_src/source/libraries/output.rst @@ -105,7 +105,7 @@ Permits you to manually set a server status header. Example:: `See here <http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html>`_ for a full list of headers. -.. note:: This method is an alias for :doc:`Common function <../general/common_funtions.rst>` +.. note:: This method is an alias for :doc:`Common function <../general/common_functions.rst>` ``set_status_header()``. $this->output->enable_profiler(); |