summaryrefslogtreecommitdiffstats
path: root/user_guide/database/index.html
diff options
context:
space:
mode:
authorDerek Jones <derek.jones@ellislab.com>2011-07-02 01:04:45 +0200
committerDerek Jones <derek.jones@ellislab.com>2011-07-02 01:04:45 +0200
commitd01e4a612cc3d445aab8a73b63d5b0d5466e394d (patch)
tree153cb1ff52bb6c66f5029de065a01fcce84138b8 /user_guide/database/index.html
parent37f4b9caa02783e06dd7c5318200113409a0deb1 (diff)
parent2ca826b0888096d3ab252cb642975dcc1e57ceab (diff)
hand merged remaining unresolved files following the backout of 648b42a75739, which was a NON-trivial whitespace commit
Diffstat (limited to 'user_guide/database/index.html')
-rw-r--r--user_guide/database/index.html2
1 files changed, 1 insertions, 1 deletions
diff --git a/user_guide/database/index.html b/user_guide/database/index.html
index fa3548cf1..9c67e3b79 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:&nbsp;&nbsp;<a href="../libraries/config.html">Config Class</a>
+Previous Topic:&nbsp;&nbsp;<a href="../libraries/caching.html">Caching Class</a>
&nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;
<a href="#top">Top of Page</a>&nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;
<a href="../index.html">User Guide Home</a>&nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;