diff options
| author | Greg Aker <greg.aker@ellislab.com> | 2011-04-25 18:30:27 +0200 |
|---|---|---|
| committer | Greg Aker <greg.aker@ellislab.com> | 2011-04-25 18:30:27 +0200 |
| commit | 42812532a901394d2188549fdb150d229edc6466 (patch) | |
| tree | ddf96dd821b225ce0d4a714c0568f5394ad83320 | |
| parent | 89c11b1de2b3a19da93e506f095aecf8221c1401 (diff) | |
| parent | c0d129c4d248471c2dfdc4584c2b00c4fcf62cb3 (diff) | |
Merging in default
| -rw-r--r-- | user_guide/database/index.html | 2 | ||||
| -rw-r--r-- | user_guide/database/utilities.html | 2 | ||||
| -rw-r--r-- | user_guide/helpers/array_helper.html | 4 | ||||
| -rw-r--r-- | user_guide/helpers/captcha_helper.html | 6 | ||||
| -rw-r--r-- | user_guide/helpers/cookie_helper.html | 2 | ||||
| -rw-r--r-- | user_guide/libraries/caching.html | 4 | ||||
| -rw-r--r-- | user_guide/libraries/javascript.html | 6 | ||||
| -rw-r--r-- | user_guide/libraries/zip.html | 2 | ||||
| -rw-r--r-- | user_guide/nav/nav.js | 2 | ||||
| -rw-r--r-- | user_guide/toc.html | 2 |
10 files changed, 18 insertions, 14 deletions
diff --git a/user_guide/database/index.html b/user_guide/database/index.html index 594de80dd..1f0a1da7d 100644 --- a/user_guide/database/index.html +++ b/user_guide/database/index.html @@ -86,7 +86,7 @@ structures and Active Record patterns. The database functions offer clear, simpl <div id="footer"> <p> -Previous Topic: <a href="../libraries/config.html">Config Class</a> +Previous Topic: <a href="../libraries/caching.html">Caching Class</a> · <a href="#top">Top of Page</a> · <a href="../index.html">User Guide Home</a> · diff --git a/user_guide/database/utilities.html b/user_guide/database/utilities.html index ec45f2688..64343cc01 100644 --- a/user_guide/database/utilities.html +++ b/user_guide/database/utilities.html @@ -306,7 +306,7 @@ Previous Topic: <a href="forge.html">DB Forge Class</a> · <a href="#top">Top of Page</a> · <a href="../index.html">User Guide Home</a> · -Next Topic: <a href="../libraries/email.html"> Email Class</a></p> +Next Topic: <a href="../libraries/javascript.html">Javascript Class</a></p> <p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> diff --git a/user_guide/helpers/array_helper.html b/user_guide/helpers/array_helper.html index 88e8384d5..139bbe2b5 100644 --- a/user_guide/helpers/array_helper.html +++ b/user_guide/helpers/array_helper.html @@ -159,10 +159,10 @@ $this->post_model->update(elements(array('id', 'title', 'content'), $_POST)); <div id="footer"> <p> -Previous Topic: <a href="../libraries/zip.html">Zip Encoding Class</a> · +Previous Topic: <a href="../libraries/javascript.html">Javascript Class</a> · <a href="#top">Top of Page</a> · <a href="../index.html">User Guide Home</a> · -Next Topic: <a href="compatibility_helper.html">Compatibility Helper</a></p> +Next Topic: <a href="captcha_helper.html">CAPTCHA Helper</a></p> <p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> diff --git a/user_guide/helpers/captcha_helper.html b/user_guide/helpers/captcha_helper.html index 3c6fa1188..c80c2fbe5 100644 --- a/user_guide/helpers/captcha_helper.html +++ b/user_guide/helpers/captcha_helper.html @@ -183,11 +183,11 @@ if ($row->count == 0)<br /> <div id="footer"> <p> -Previous Topic: <a href="url_helper.html">URL Helper</a> +Previous Topic: <a href="array_helper.html">Array Helper</a> · <a href="#top">Top of Page</a> · -<a href="../index.html">User Guide Home</a> -</p> +<a href="../index.html">User Guide Home</a> · +Next Topic: <a href="cookie_helper.html">Cookie Helper</a></p> <p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> diff --git a/user_guide/helpers/cookie_helper.html b/user_guide/helpers/cookie_helper.html index 9879653c1..889c3346e 100644 --- a/user_guide/helpers/cookie_helper.html +++ b/user_guide/helpers/cookie_helper.html @@ -95,7 +95,7 @@ of values in the first parameter or you can set discrete parameters.</p> <div id="footer"> <p> -Previous Topic: <a href="compatibility_helper.html">Compatibility Helper</a> +Previous Topic: <a href="captcha_helper.html">CAPTCHA Helper</a> · <a href="#top">Top of Page</a> · <a href="../index.html">User Guide Home</a> · diff --git a/user_guide/libraries/caching.html b/user_guide/libraries/caching.html index 3fa9fa6a4..7e1339217 100644 --- a/user_guide/libraries/caching.html +++ b/user_guide/libraries/caching.html @@ -180,11 +180,11 @@ if ($this->cache->apc->is_supported())<br /> <div id="footer"> <p> -Previous Topic: <a href="errors.html">Error Handling</a> +Previous Topic: <a href="zip.html">Zip Encoding Class</a> · <a href="#top">Top of Page</a> · <a href="../index.html">User Guide Home</a> · -Next Topic: <a href="profiling.html">Profiling Your Application</a> +Next Topic: <a href="../database/index.html">Database Class</a> </p> <p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> diff --git a/user_guide/libraries/javascript.html b/user_guide/libraries/javascript.html index cd3adf1d2..5929cbec9 100644 --- a/user_guide/libraries/javascript.html +++ b/user_guide/libraries/javascript.html @@ -2,7 +2,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <head> -<title>CodeIgniter User Guide : JavaScript Class</title> +<title>JavaScript Class : CodeIgniter User Guide</title> <style type='text/css' media='all'>@import url('../userguide.css');</style> <link rel='stylesheet' type='text/css' media='all' href='../userguide.css' /> @@ -235,11 +235,11 @@ $this->jquery->slideToggle(target, optional speed, optional extra informat <div id="footer"> <p> -Previous Topic: <a href="input.html">Input Class</a> +Previous Topic: <a href="../database/index.html">Database Class</a> · <a href="#top">Top of Page</a> · <a href="../index.html">User Guide Home</a> · -Next Topic: <a href="language.html">Language Class</a></p> +Next Topic: <a href="../helpers/array_helper.html">Array Helper</a></p> <p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> diff --git a/user_guide/libraries/zip.html b/user_guide/libraries/zip.html index 2fc5fd81b..e6405cc8f 100644 --- a/user_guide/libraries/zip.html +++ b/user_guide/libraries/zip.html @@ -279,7 +279,7 @@ Previous Topic: <a href="xmlrpc.html"> XML-RPC Class</a> · <a href="#top">Top of Page</a> · <a href="../index.html">User Guide Home</a> · -Next Topic: <a href="../helpers/array_helper.html">Array Helper</a> +Next Topic: <a href="caching.html">Caching Class</a> </p> <p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> diff --git a/user_guide/nav/nav.js b/user_guide/nav/nav.js index ce783fc27..b44994d4d 100644 --- a/user_guide/nav/nav.js +++ b/user_guide/nav/nav.js @@ -50,6 +50,8 @@ function create_menu(basepath) '<li><a href="'+base+'general/helpers.html">Helpers</a></li>' + '<li><a href="'+base+'general/libraries.html">Using CodeIgniter Libraries</a></li>' + '<li><a href="'+base+'general/creating_libraries.html">Creating Your Own Libraries</a></li>' + + '<li><a href="'+base+'general/drivers.html">Using CodeIgniter Drivers</a></li>' + + '<li><a href="'+base+'general/creating_drivers.html">Creating Your Own Drivers</a></li>' + '<li><a href="'+base+'general/core_classes.html">Creating Core Classes</a></li>' + '<li><a href="'+base+'general/hooks.html">Hooks - Extending the Core</a></li>' + '<li><a href="'+base+'general/autoloader.html">Auto-loading Resources</a></li>' + diff --git a/user_guide/toc.html b/user_guide/toc.html index 4b4ab1001..f6a5fe0ec 100644 --- a/user_guide/toc.html +++ b/user_guide/toc.html @@ -103,6 +103,8 @@ Table of Contents <li><a href="./general/helpers.html">Helpers</a></li> <li><a href="./general/libraries.html">Using CodeIgniter Libraries</a></li> <li><a href="./general/creating_libraries.html">Creating Your Own Libraries</a></li> + <li><a href="./general/drivers.html">Using CodeIgniter Drivers</a></li> + <li><a href="./general/creating_drivers.html">Creating Your Own Drivers</a></li> <li><a href="./general/core_classes.html">Creating Core Classes</a></li> <li><a href="./general/hooks.html">Hooks - Extending the Core</a></li> <li><a href="./general/autoloader.html">Auto-loading Resources</a></li> |