summaryrefslogtreecommitdiffstats
path: root/application/config/example/database.php
diff options
context:
space:
mode:
authorFlorian Pritz <bluewind@xinu.at>2018-03-20 17:30:02 +0100
committerFlorian Pritz <bluewind@xinu.at>2018-03-20 17:30:02 +0100
commit006cf0764295d37daa597f4ea9cf31abb75d1b68 (patch)
tree4f40341fef42c760330e2caa501881ab195a67b2 /application/config/example/database.php
parent61e2a033717a4669117696d0b6913474e3f57954 (diff)
parent02a0518e1c56ba3506f370362ac5ebdb8a138312 (diff)
Merge tag 'ci-upstream/3.1.7' into dev
Signed-off-by: Florian Pritz <bluewind@xinu.at>
Diffstat (limited to 'application/config/example/database.php')
-rw-r--r--application/config/example/database.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/application/config/example/database.php b/application/config/example/database.php
index 54a0ee91f..5bfc5b293 100644
--- a/application/config/example/database.php
+++ b/application/config/example/database.php
@@ -45,7 +45,7 @@ defined('BASEPATH') OR exit('No direct script access allowed');
| 'ssl_key' - Path to the private key file
| 'ssl_cert' - Path to the public key certificate file
| 'ssl_ca' - Path to the certificate authority file
-| 'ssl_capath' - Path to a directory containing trusted CA certificats in PEM format
+| 'ssl_capath' - Path to a directory containing trusted CA certificates in PEM format
| 'ssl_cipher' - List of *allowed* ciphers to be used for the encryption, separated by colons (':')
| 'ssl_verify' - TRUE/FALSE; Whether verify the server certificate or not ('mysqli' only)
|