From 3f45bbdcfabac41fa3ee33277a21727f71de991a Mon Sep 17 00:00:00 2001
From: Derek Allard <derek.allard@ellislab.com>
Date: Sun, 7 Dec 2008 17:00:09 +0000
Subject: fixed a broken link, fixed a typo

---
 user_guide/changelog.html           | 1 +
 user_guide/database/connecting.html | 2 +-
 user_guide/libraries/loader.html    | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'user_guide')

diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index 196817552..3dd056d06 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -84,6 +84,7 @@ SVN Revision: </p>
 
 <h3>Bug fixes for 1.7.1</h3>
 <ul>
+	<li>Fixed assorted user guide typos or examples.</li>
 	<li>Fixed a bug in the MySQLi driver when no port is specified</li>
 	<li>Fixed a bug (#5702), in which the field label was not being fetched properly, when "matching" one field to another.</li>
 	<li>Fixed a bug in which identifers were not being escaped properly when reserved characters were used.</li>
diff --git a/user_guide/database/connecting.html b/user_guide/database/connecting.html
index 90f901104..373c0567b 100644
--- a/user_guide/database/connecting.html
+++ b/user_guide/database/connecting.html
@@ -89,7 +89,7 @@ to the group specified in your database config file. For most people, this is th
 </ol>
 
 
-<h3>Manuallly Connecting to a Database</h3>
+<h3>Manually Connecting to a Database</h3>
 
 <p>The first parameter of this function can <strong>optionally</strong> be used to specify a particular database group
 from your config file, or you can even submit connection values for a database that is not specified in your config file.
diff --git a/user_guide/libraries/loader.html b/user_guide/libraries/loader.html
index 2680dfab4..5bf938c0a 100644
--- a/user_guide/libraries/loader.html
+++ b/user_guide/libraries/loader.html
@@ -153,7 +153,7 @@ to your browser.  Remember to assign it to a variable if you want the data retur
 $this-&gt;<kbd>fubar</kbd>-&gt;function();</code>
 <h2>$this->load->database('<var>options</var>', <kbd>true/false</kbd>)</h2>
 <p>This function lets you load the database class.  The two parameters are <strong>optional</strong>.  Please see the
-<a href="./database/index.html">database</a> section for more info.</p>
+<a href="../database/index.html">database</a> section for more info.</p>
 
 
 <h2>$this->load->scaffolding('<var>table_name</var>')</h2>
-- 
cgit v1.2.3-24-g4f1b