summaryrefslogtreecommitdiffstats
path: root/user_guide/database/connecting.html
diff options
context:
space:
mode:
authorDerek Jones <derek.jones@ellislab.com>2011-07-02 00:40:48 +0200
committerDerek Jones <derek.jones@ellislab.com>2011-07-02 00:40:48 +0200
commit4b9c62980599228f070b401c7673dce8085b0c61 (patch)
tree314bd87831a09913cbbfd1ffe1447b3c38b394c5 /user_guide/database/connecting.html
parent114ab0988e20ac6be39ad363ff897a1a3b85e565 (diff)
backed out 648b42a75739, which was a NON-trivial whitespace commit. It broke the Typography class's string replacements, for instance
Diffstat (limited to 'user_guide/database/connecting.html')
-rw-r--r--user_guide/database/connecting.html6
1 files changed, 3 insertions, 3 deletions
diff --git a/user_guide/database/connecting.html b/user_guide/database/connecting.html
index 1a74f5571..bb1b401f9 100644
--- a/user_guide/database/connecting.html
+++ b/user_guide/database/connecting.html
@@ -84,8 +84,8 @@ to the group specified in your database config file. For most people, this is th
<ol>
<li>The database connection values, passed either as an array or a DSN string.</li>
- <li>TRUE/FALSE (boolean). Whether to return the connection ID (see Connecting to Multiple Databases below).</li>
- <li>TRUE/FALSE (boolean). Whether to enable the Active Record class. Set to TRUE by default.</li>
+ <li>TRUE/FALSE (boolean). Whether to return the connection ID (see Connecting to Multiple Databases below).</li>
+ <li>TRUE/FALSE (boolean). Whether to enable the Active Record class. Set to TRUE by default.</li>
</ol>
@@ -148,7 +148,7 @@ you can pass the connection values as indicated above).</p>
<p>By setting the second parameter to TRUE (boolean) the function will return the database object.</p>
<div class="important">
-<p>When you connect this way, you will use your object name to issue commands rather than the syntax used throughout this guide. In other words, rather than issuing commands with:</p>
+<p>When you connect this way, you will use your object name to issue commands rather than the syntax used throughout this guide. In other words, rather than issuing commands with:</p>
<p>$this->db->query();<br />$this->db->result();<br /> etc...</p>