diff options
| author | Phil Sturgeon <email@philsturgeon.co.uk> | 2011-03-09 11:08:36 +0100 |
|---|---|---|
| committer | Phil Sturgeon <email@philsturgeon.co.uk> | 2011-03-09 11:08:36 +0100 |
| commit | 93ca71552d9a3e28eeaa00dd10755d20b2cbf32e (patch) | |
| tree | 660233f2ec631e5730731491d2fd244fe15f7df8 /user_guide/general | |
| parent | a9924b8352aa18869677bea0182c45e2a7e2ce37 (diff) | |
| parent | 2f8b27efeb0a39c24eddf89cf31ea0fd113a6b71 (diff) | |
Merged recent Core changes and fixed conflict.
Diffstat (limited to 'user_guide/general')
| -rw-r--r-- | user_guide/general/alternative_php.html | 2 | ||||
| -rw-r--r-- | user_guide/general/caching.html | 4 | ||||
| -rw-r--r-- | user_guide/general/views.html | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/user_guide/general/alternative_php.html b/user_guide/general/alternative_php.html index 652cdad29..c843f2f6e 100644 --- a/user_guide/general/alternative_php.html +++ b/user_guide/general/alternative_php.html @@ -94,7 +94,7 @@ written in a simplified format as well. Here is an example using foreach:</p> <code> <ul><br /> <br /> -<var><?php foreach($todo as $item): ?></var><br /> +<var><?php foreach ($todo as $item): ?></var><br /> <br /> <li><var><?=$item?></var></li><br /> <br /> diff --git a/user_guide/general/caching.html b/user_guide/general/caching.html index 440896bb7..9f49b95d6 100644 --- a/user_guide/general/caching.html +++ b/user_guide/general/caching.html @@ -68,7 +68,7 @@ By caching your pages, since they are saved in their fully rendered state, you c <h2>How Does Caching Work?</h2> <p>Caching can be enabled on a per-page basis, and you can set the length of time that a page should remain cached before being refreshed. -When a page is loaded for the first time, the cache file will be written to your <dfn>system/cache</dfn> folder. On subsequent page loads the cache file will be retrieved +When a page is loaded for the first time, the cache file will be written to your <dfn>application/cache</dfn> folder. On subsequent page loads the cache file will be retrieved and sent to the requesting user's browser. If it has expired, it will be deleted and refreshed before being sent to the browser.</p> <p>Note: The Benchmark tag is not cached so you can still view your page load speed when caching is enabled.</p> @@ -86,7 +86,7 @@ most logical to you. Once the tag is in place, your pages will begin being cache <p class="important"><strong>Warning:</strong> Because of the way CodeIgniter stores content for output, caching will only work if you are generating display for your controller with a <a href="./views.html">view</a>.</p> <p class="important"><strong>Note:</strong> Before the cache files can be written you must set the file permissions on your -<dfn>system/cache</dfn> folder such that it is writable.</p> +<dfn>application/cache</dfn> folder such that it is writable.</p> <h2>Deleting Caches</h2> diff --git a/user_guide/general/views.html b/user_guide/general/views.html index fd5bde6af..746f7b846 100644 --- a/user_guide/general/views.html +++ b/user_guide/general/views.html @@ -233,7 +233,7 @@ class Blog extends CI_Controller { <h3>My Todo List</h3> <ul> -<?php foreach($todo_list as $item):?> +<?php foreach ($todo_list as $item):?> <li><?php echo $item;?></li> |