From b5f211b14198afce3a4a60000f9ab3b8f14d0d6d Mon Sep 17 00:00:00 2001
From: Derek Allard <derek.allard@ellislab.com>
Date: Sun, 17 Jan 2010 15:42:56 +0000
Subject: doc updates, corrections and clarifications.

---
 user_guide/changelog.html        | 2 +-
 user_guide/general/routing.html  | 2 +-
 user_guide/libraries/loader.html | 2 +-
 user_guide/libraries/uri.html    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index 922823235..b8655de51 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -99,7 +99,7 @@ SVN Revision: </p>
 
 <h3>Bug fixes for 1.7.3</h3>
 <ul>
-	<li>Fixed assorted user guide typos or examples (#10693, #8951).</li>
+	<li>Fixed assorted user guide typos or examples (#10693, #8951, #7825, #8660, #7883).</li>
 	<li>Increased randomness with <kbd>is_really_writable()</kbd> to avoid file collisions when hundreds or thousands of requests occur at once.</li>
 	<li>Fixed or clarified assorted user guide typos or examples.</li>
 	<li>Made <kbd>get_mime_by_extension()</kbd> case insensitive.</li>
diff --git a/user_guide/general/routing.html b/user_guide/general/routing.html
index 01a8aef8e..11ff4a2f6 100644
--- a/user_guide/general/routing.html
+++ b/user_guide/general/routing.html
@@ -117,7 +117,7 @@ Higher routes will always take precedence over lower ones.</p>
 <p>A URL with "product" as the first segment, and anything in the second will be remapped to the "catalog" class and the  "product_lookup" method.</p>
 
 <code>$route['product/(:num)'] = "catalog/product_lookup_by_id/$1";</code>
-<p>A URL with "product" as the first segment, and anything in the second will be remapped to the "catalog" class and the "product_lookup_by_id" method passing in the match as a variable to the function.</p>
+<p>A URL with "product" as the first segment, and a number in the second will be remapped to the "catalog" class and the "product_lookup_by_id" method passing in the match as a variable to the function.</p>
 
 <p class="important"><strong>Important:</strong> Do not use leading/trailing slashes.</p>
 
diff --git a/user_guide/libraries/loader.html b/user_guide/libraries/loader.html
index 19a10e4db..cefe8ef06 100644
--- a/user_guide/libraries/loader.html
+++ b/user_guide/libraries/loader.html
@@ -186,7 +186,7 @@ By default the data is sent to your browser, just like a View file, but if you s
 it will instead return the data as a string.</p>
 
 
-<h2>$this->load->lang('<var>file_name</var>')</h2>
+<h2>$this->load->language('<var>file_name</var>')</h2>
 <p>This function is an alias of the <a href="language.html">language loading function</a>: $this->lang->load()</p>
 
 <h2>$this->load->config('<var>file_name</var>')</h2>
diff --git a/user_guide/libraries/uri.html b/user_guide/libraries/uri.html
index 818115ff9..af5994cb6 100644
--- a/user_guide/libraries/uri.html
+++ b/user_guide/libraries/uri.html
@@ -194,7 +194,7 @@ $str = $this->uri->assoc_to_uri($array);<br />
 <code>/news/local/345</code>
 
 
-<h2>$this->uri->ruri_string(<var>n</var>)</h2>
+<h2>$this->uri->ruri_string()</h2>
 
 <p>This function is identical to the previous one, except that it returns the
 re-routed URI in the event you are using CodeIgniter's <a href="../general/routing.html">URI Routing</a> feature.</p>
-- 
cgit v1.2.3-24-g4f1b