Merge branch 'feature/mysqli-ssl' of github.com:ndigitals/CodeIgniter into feature/mysqli_ssl

1 files changed, 9 insertions, 3 deletions

diff --git a/user_guide_src/source/database/configuration.rst b/user_guide_src/source/database/configuration.rst
index d21c79e44..6f1726ef6 100644
--- a/user_guide_src/source/database/configuration.rst
+++ b/user_guide_src/source/database/configuration.rst
@@ -30,6 +30,7 @@ prototype::
 		'encrypt' => FALSE,
 		'compress' => FALSE,
 		'stricton' => FALSE,
+		'ssl_options' => array(),
 		'failover' => array()
 	);
 
@@ -71,7 +72,8 @@ These failovers can be specified by setting the failover for a connection like t
 				'swap_pre' => '',
 				'encrypt' => FALSE,
 				'compress' => FALSE,
-				'stricton' => FALSE
+				'stricton' => FALSE,
+				'ssl_options' => array()
 			),
 			array(
 				'hostname' => 'localhost2',
@@ -89,7 +91,8 @@ These failovers can be specified by setting the failover for a connection like t
 				'swap_pre' => '',
 				'encrypt' => FALSE,
 				'compress' => FALSE,
-				'stricton' => FALSE
+				'stricton' => FALSE,
+				'ssl_options' => array()
 			)
 		);
 
@@ -120,6 +123,7 @@ example, to set up a "test" environment you would do this::
 		'compress' => FALSE,
 		'encrypt' => FALSE,
 		'stricton' => FALSE,
+		'ssl_options' => array(),
 		'failover' => array()
 	);
 
@@ -186,10 +190,12 @@ Explanation of Values:
 			::
 
 				$db['default']['port'] = 5432;
+
+**ssl_options**		Used to set various SSL connection options and values.
 ======================  ==================================================================================================
 
 .. note:: Depending on what database platform you are using (MySQL, PostgreSQL,
 	etc.) not all values will be needed. For example, when using SQLite you
 	will not need to supply a username or password, and the database name
 	will be the path to your database file. The information above assumes
-	you are using MySQL.
\ No newline at end of file
+	you are using MySQL.