summaryrefslogtreecommitdiffstats
path: root/user_guide
diff options
context:
space:
mode:
Diffstat (limited to 'user_guide')
-rw-r--r--user_guide/changelog.html1
-rw-r--r--user_guide/database/utilities.html2
-rw-r--r--user_guide/general/alternative_php.html2
-rw-r--r--user_guide/general/views.html2
-rw-r--r--user_guide/installation/downloads.html6
-rw-r--r--user_guide/libraries/cart.html2
-rw-r--r--user_guide/libraries/file_uploading.html2
-rw-r--r--user_guide/toc.html20
8 files changed, 24 insertions, 13 deletions
diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index 388f25d2a..c37bd4f26 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -75,6 +75,7 @@ Hg Tag: n/a</p>
<ul>
<li class="reactor">CLI requests can now be run from any folder, not just when CD'ed next to index.php.</li>
<li class="reactor">Fixed issue #41: Added audio/mp3 mime type to mp3.</li>
+ <li class="reactor">Fixed a bug (#329) where the file caching driver referenced the incorrect cache directory.</li>
</ul>
<h2>Version 2.0.0</h2>
diff --git a/user_guide/database/utilities.html b/user_guide/database/utilities.html
index ac3841641..4a8b6739e 100644
--- a/user_guide/database/utilities.html
+++ b/user_guide/database/utilities.html
@@ -96,7 +96,7 @@ already be running, since the utilities class relies on it.</p>
<code>
$dbs = $this->dbutil->list_databases();<br />
<br />
-foreach($dbs as $db)<br />
+foreach ($dbs as $db)<br />
{<br />
&nbsp;&nbsp;&nbsp; echo $db;<br />
}</code>
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>
&lt;ul><br />
<br />
-<var>&lt;?php foreach($todo as $item): ?></var><br />
+<var>&lt;?php foreach ($todo as $item): ?></var><br />
<br />
&lt;li><var>&lt;?=$item?></var>&lt;/li><br />
<br />
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 {
&lt;h3>My Todo List&lt;/h3>
&lt;ul>
-&lt;?php foreach($todo_list as $item):?>
+&lt;?php foreach ($todo_list as $item):?>
&lt;li>&lt;?php echo $item;?>&lt;/li>
diff --git a/user_guide/installation/downloads.html b/user_guide/installation/downloads.html
index d580fde7b..ad653307a 100644
--- a/user_guide/installation/downloads.html
+++ b/user_guide/installation/downloads.html
@@ -58,7 +58,9 @@ Downloading CodeIgniter
<h1>Downloading CodeIgniter</h1>
<ul>
-<li><a href="http://codeigniter.com/download.php">CodeIgniter V 1.7.2 (Current version)</a></li>
+<li><a href="http://codeigniter.com/downloads/">CodeIgniter V 2.0.0 (Current version)</a></li>
+<li><a href="http://codeigniter.com/download_files/CodeIgniter_1.7.3.zip">CodeIgniter V 1.7.3</a></li>
+<li><a href="http://codeigniter.com/download_files/CodeIgniter_1.7.2.zip">CodeIgniter V 1.7.2</a></li>
<li><a href="http://codeigniter.com/download_files/CodeIgniter_1.7.1.zip">CodeIgniter V 1.7.1</a></li>
<li><a href="http://codeigniter.com/download_files/CodeIgniter_1.7.0.zip">CodeIgniter V 1.7.0</a></li>
<li><a href="http://codeigniter.com/download_files/CodeIgniter_1.6.3.zip">CodeIgniter V 1.6.3</a></li>
@@ -85,7 +87,7 @@ Downloading CodeIgniter
<h1 id="hg">Mercurial Server</h1>
<p><a href="http://mercurial.selenic.com">Mercurial</a> is a distributed version control system.</p>
- <p>Public Hg access is available at <a href="http://bitbucket.org/ellislab/codeigniter/">BitBucket</a>.
+ <p>Public Hg access is available at <a href="http://bitbucket.org/ellislab/codeigniter-reactor/">BitBucket</a>.
Please note that while every effort is made to keep this code base functional, we cannot guarantee the functionality of code taken
from the tip.</p>
diff --git a/user_guide/libraries/cart.html b/user_guide/libraries/cart.html
index bc0721bb4..fe87a23f2 100644
--- a/user_guide/libraries/cart.html
+++ b/user_guide/libraries/cart.html
@@ -178,7 +178,7 @@ $this->cart->insert($data);
&lt;?php $i = 1; ?>
-&lt;?php foreach($this->cart->contents() as $items): ?>
+&lt;?php foreach ($this->cart->contents() as $items): ?>
&lt;?php echo form_hidden($i.'[rowid]', $items['rowid']); ?>
diff --git a/user_guide/libraries/file_uploading.html b/user_guide/libraries/file_uploading.html
index c5eab4695..5c3162819 100644
--- a/user_guide/libraries/file_uploading.html
+++ b/user_guide/libraries/file_uploading.html
@@ -125,7 +125,7 @@ In it, place this code and save it to your <samp>applications/views/</samp> fold
&lt;h3>Your file was successfully uploaded!&lt;/h3>
&lt;ul>
-&lt;?php foreach($upload_data as $item => $value):?>
+&lt;?php foreach ($upload_data as $item => $value):?>
&lt;li>&lt;?php echo $item;?>: &lt;?php echo $value;?>&lt;/li>
&lt;?php endforeach; ?>
&lt;/ul>
diff --git a/user_guide/toc.html b/user_guide/toc.html
index 5eb9c2acc..9f51b1e91 100644
--- a/user_guide/toc.html
+++ b/user_guide/toc.html
@@ -118,6 +118,13 @@ Table of Contents
<li><a href="./doc_style/index.html">Writing Documentation</a></li>
</ul>
+<h3>Additional Resources</h3>
+
+<ul>
+<li><a href="http://codeigniter.com/forums/">Community Forums</a></li>
+<li><a href="http://codeigniter.com/wiki/">Community Wiki</a></li>
+</ul>
+
</td>
<td valign="top" width="25%">
@@ -127,7 +134,6 @@ Table of Contents
<li><a href="./libraries/calendar.html">Calendar Class</a></li>
<li><a href="./libraries/cart.html">Cart Class</a></li>
<li><a href="./libraries/config.html">Config Class</a></li>
-<li><a href="./database/index.html">Database Class</a></li>
<li><a href="./libraries/email.html">Email Class</a></li>
<li><a href="./libraries/encryption.html">Encryption Class</a></li>
<li><a href="./libraries/file_uploading.html">File Uploading Class</a></li>
@@ -157,6 +163,13 @@ Table of Contents
</td>
<td valign="top" width="25%">
+<h3>Driver Reference</h3>
+<ul>
+<li><a href="./libraries/caching.html">Caching Class</a></li>
+<li><a href="./database/index.html">Database Class</a></li>
+<li><a href="./libraries/javascript.html">Javascript Class</a></li>
+</ul>
+
<h3>Helper Reference</h3>
<ul>
<li><a href="./helpers/array_helper.html">Array Helper</a></li>
@@ -182,12 +195,7 @@ Table of Contents
<li><a href="./helpers/xml_helper.html">XML Helper</a></li>
</ul>
-<h3>Additional Resources</h3>
-<ul>
-<li><a href="http://codeigniter.com/forums/">Community Forums</a></li>
-<li><a href="http://codeigniter.com/wiki/">Community Wiki</a></li>
-</ul>
</td>