From 37f4b9caa02783e06dd7c5318200113409a0deb1 Mon Sep 17 00:00:00 2001
From: Derek Jones
Date: Fri, 1 Jul 2011 17:56:50 -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/connecting.html | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
(limited to 'user_guide/database/connecting.html')
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
- The database connection values, passed either as an array or a DSN string.
- - TRUE/FALSE (boolean). Whether to return the connection ID (see Connecting to Multiple Databases below).
- - TRUE/FALSE (boolean). Whether to enable the Active Record class. Set to TRUE by default.
+ - TRUE/FALSE (boolean). Whether to return the connection ID (see Connecting to Multiple Databases below).
+ - TRUE/FALSE (boolean). Whether to enable the Active Record class. Set to TRUE by default.
@@ -148,7 +148,7 @@ you can pass the connection values as indicated above).
By setting the second parameter to TRUE (boolean) the function will return the database object.
-
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:
+
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:
$this->db->query();
$this->db->result();
etc...
--
cgit v1.2.3-24-g4f1b
From 9c63d0bb34be4007178d5a7e46348d5e23fee3ff Mon Sep 17 00:00:00 2001
From: Phil Sturgeon
Date: Thu, 27 Oct 2011 01:55:44 +0100
Subject: Bumped CodeIgniter version to 2.1.0.
---
user_guide/database/connecting.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'user_guide/database/connecting.html')
diff --git a/user_guide/database/connecting.html b/user_guide/database/connecting.html
index 309f2bc1a..f86602269 100644
--- a/user_guide/database/connecting.html
+++ b/user_guide/database/connecting.html
@@ -28,7 +28,7 @@