From 4b9c62980599228f070b401c7673dce8085b0c61 Mon Sep 17 00:00:00 2001
From: Derek Jones <derek.jones@ellislab.com>
Date: Fri, 1 Jul 2011 17:40:48 -0500
Subject: backed out 648b42a75739, which was a NON-trivial whitespace commit. 
 It broke the Typography class's string replacements, for instance

---
 user_guide/database/call_function.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'user_guide/database/call_function.html')

diff --git a/user_guide/database/call_function.html b/user_guide/database/call_function.html
index 7f294401e..3e0c78d3d 100644
--- a/user_guide/database/call_function.html
+++ b/user_guide/database/call_function.html
@@ -63,13 +63,13 @@ Custom Function Calls
 
 <p>This function enables you to call PHP database functions that are not natively included in CodeIgniter, in a platform independent manner.
 For example, lets say you want to call the <dfn>mysql_get_client_info()</dfn> function, which is <strong>not</strong> natively supported
-by CodeIgniter. You could do so like this:
+by CodeIgniter.  You could do so like this:
 </p>
 
 <code>$this->db->call_function('<var>get_client_info</var>');</code>
 
-<p>You must supply the name of the function, <strong>without</strong> the <var>mysql_</var> prefix, in the first parameter. The prefix is added
-automatically based on which database driver is currently being used. This permits you to run the same function on different database platforms.
+<p>You must supply the name of the function, <strong>without</strong> the <var>mysql_</var> prefix, in the first parameter.  The prefix is added
+automatically based on which database driver is currently being used.  This permits you to run the same function on different database platforms.
 Obviously not all function calls are identical between platforms, so there are limits to how useful this function can be in terms of portability.</p>
 
 <p>Any parameters needed by the function you are calling will be added to the second parameter.</p>
@@ -77,7 +77,7 @@ Obviously not all function calls are identical between platforms, so there are l
 <code>$this->db->call_function('<var>some_function</var>', $param1, $param2, etc..);</code>
 
 
-<p>Often, you will either need to supply a database connection ID or a database result ID. The connection ID can be accessed using:</p>
+<p>Often, you will either need to supply a database connection ID or a database result ID.  The connection ID can be accessed using:</p>
 
 <code>$this->db->conn_id;</code>
 
-- 
cgit v1.2.3-24-g4f1b


From b8c038a3e7742f32915d7f1ab69627075e8d0c39 Mon Sep 17 00:00:00 2001
From: Derek Jones <derek.jones@ellislab.com>
Date: Sat, 20 Aug 2011 08:57:14 -0500
Subject: updated version number in user guide, removed some stray merge
 markers found in the change log

---
 user_guide/database/call_function.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'user_guide/database/call_function.html')

diff --git a/user_guide/database/call_function.html b/user_guide/database/call_function.html
index 3e0c78d3d..38cbd1b2c 100644
--- a/user_guide/database/call_function.html
+++ b/user_guide/database/call_function.html
@@ -28,7 +28,7 @@
 <div id="masthead">
 <table cellpadding="0" cellspacing="0" border="0" style="width:100%">
 <tr>
-<td><h1>CodeIgniter User Guide Version 2.0.2</h1></td>
+<td><h1>CodeIgniter User Guide Version 2.0.3</h1></td>
 <td id="breadcrumb_right"><a href="../toc.html">Table of Contents Page</a></td>
 </tr>
 </table>
-- 
cgit v1.2.3-24-g4f1b